From d8e2510206ad46782dca514f654df80b7d5b7b67 Mon Sep 17 00:00:00 2001 From: "Ching-Hua (Vivian) Lin" Date: Wed, 9 Oct 2024 17:30:04 +0800 Subject: [PATCH 01/62] refactor(iota-framework/iota-system): Remove multiple versions from the iota-system types (#3048) * refactor(iota-framework/iota-system): Remove deprecated structures * refactor(iota-framework/iota-system): Rename ValidatorSet to ValidatorSetV1 * refactor(iota-framework/iota-system): Rename Validator to ValidatorV1 * refactor(iota-framework/iota-system): Rename ValidatorMetadata to ValidatorMetadataV1 * refactor(iota-framework/iota-system): Rename IotaSystemStateInnerV1 to IotaSystemStateV1 * refactor(iota-framework/iota-system): Rename SystemEpochInfoEvent to SystemEpochInfoEventV1 * refactor(iota-framework/iota-system): Rename StakingPool to StakingPoolV1 * refactor(iota-framework/iota-system): Rename PoolTokenExchangeRate to PoolTokenExchangeRateV1 * refactor(iota-framework/iota-system): Rename StakedIota to StakedIotaV1 * refactor(iota-framework/iota-system): Rename StorageFund to StorageFundV1 * refactor(iota-framework/iota-system): Rename TimelockedStakedIota to TimelockedStakedIotaV1 * refactor(iota-framework/iota-system): Rename IotaSystemStateInner to IotaSystemState in comments --- .../packages/iota-system/sources/genesis.move | 12 +- .../iota-system/sources/iota_system.move | 77 ++--- .../sources/iota_system_state_inner.move | 301 +++++------------- .../iota-system/sources/staking_pool.move | 130 ++++---- .../iota-system/sources/storage_fund.move | 12 +- .../sources/timelocked_staking.move | 108 +++---- .../iota-system/sources/validator.move | 180 +++++------ .../iota-system/sources/validator_set.move | 181 +++++------ .../sources/validator_wrapper.move | 12 +- .../iota-system/sources/voting_power.move | 31 +- .../iota-system/tests/delegation_tests.move | 32 +- .../tests/governance_test_utils.move | 18 +- .../iota-system/tests/iota_system_tests.move | 10 +- .../tests/timelocked_delegation_tests.move | 72 ++--- .../tests/validator_set_tests.move | 16 +- .../iota-system/tests/validator_tests.move | 16 +- .../iota-system/tests/voting_power_tests.move | 4 +- 17 files changed, 526 insertions(+), 686 deletions(-) diff --git a/crates/iota-framework/packages/iota-system/sources/genesis.move b/crates/iota-framework/packages/iota-system/sources/genesis.move index d3d641d8f22..32ad83aeabf 100644 --- a/crates/iota-framework/packages/iota-system/sources/genesis.move +++ b/crates/iota-framework/packages/iota-system/sources/genesis.move @@ -10,7 +10,7 @@ module iota_system::genesis { use iota::iota::{Self, IotaTreasuryCap}; use iota::timelock::SystemTimelockCap; use iota_system::iota_system; - use iota_system::validator::{Self, Validator}; + use iota_system::validator::{Self, ValidatorV1}; use iota_system::validator_set; use iota_system::iota_system_state_inner; use iota_system::timelocked_staking; @@ -43,7 +43,7 @@ module iota_system::genesis { chain_start_timestamp_ms: u64, epoch_duration_ms: u64, - // Validator committee parameters + // ValidatorV1 committee parameters max_validator_count: u64, min_validator_joining_stake: u64, validator_low_stake_threshold: u64, @@ -101,7 +101,7 @@ module iota_system::genesis { let storage_fund = balance::zero(); - // Create all the `Validator` structs + // Create all the `ValidatorV1` structs let mut validators = vector[]; let count = genesis_validators.length(); let mut i = 0; @@ -169,7 +169,7 @@ module iota_system::genesis { let system_parameters = iota_system_state_inner::create_system_parameters( genesis_chain_parameters.epoch_duration_ms, - // Validator committee parameters + // ValidatorV1 committee parameters genesis_chain_parameters.max_validator_count, genesis_chain_parameters.min_validator_joining_stake, genesis_chain_parameters.validator_low_stake_threshold, @@ -195,7 +195,7 @@ module iota_system::genesis { fun allocate_tokens( iota_treasury_cap: &mut IotaTreasuryCap, mut allocations: vector, - validators: &mut vector, + validators: &mut vector, timelock_genesis_label: Option, ctx: &mut TxContext, ) { @@ -242,7 +242,7 @@ module iota_system::genesis { allocations.destroy_empty(); } - fun activate_validators(validators: &mut vector) { + fun activate_validators(validators: &mut vector) { // Activate all genesis validators let count = validators.length(); let mut i = 0; diff --git a/crates/iota-framework/packages/iota-system/sources/iota_system.move b/crates/iota-framework/packages/iota-system/sources/iota_system.move index be1cfe715ce..7aadc5ed292 100644 --- a/crates/iota-framework/packages/iota-system/sources/iota_system.move +++ b/crates/iota-framework/packages/iota-system/sources/iota_system.move @@ -3,24 +3,24 @@ // SPDX-License-Identifier: Apache-2.0 /// Iota System State Type Upgrade Guide -/// `IotaSystemState` is a thin wrapper around `IotaSystemStateInner` that provides a versioned interface. -/// The `IotaSystemState` object has a fixed ID 0x5, and the `IotaSystemStateInner` object is stored as a dynamic field. -/// There are a few different ways to upgrade the `IotaSystemStateInner` type: +/// `IotaSystemState` is a thin wrapper around `IotaSystemStateV1` that provides a versioned interface. +/// The `IotaSystemState` object has a fixed ID 0x5, and the `IotaSystemStateV1` object is stored as a dynamic field. +/// There are a few different ways to upgrade the `IotaSystemStateV1` type: /// /// The simplest and one that doesn't involve a real upgrade is to just add dynamic fields to the `extra_fields` field -/// of `IotaSystemStateInner` or any of its sub type. This is useful when we are in a rush, or making a small change, +/// of `IotaSystemStateV1` or any of its sub type. This is useful when we are in a rush, or making a small change, /// or still experimenting a new field. /// -/// To properly upgrade the `IotaSystemStateInner` type, we need to ship a new framework that does the following: -/// 1. Define a new `IotaSystemStateInner`type (e.g. `IotaSystemStateInnerV2`). -/// 2. Define a data migration function that migrates the old `IotaSystemStateInner` to the new one (i.e. IotaSystemStateInnerV2). -/// 3. Replace all uses of `IotaSystemStateInner` with `IotaSystemStateInnerV2` in both iota_system.move and iota_system_state_inner.move, +/// To properly upgrade the `IotaSystemStateV1` type, we need to ship a new framework that does the following: +/// 1. Define a new `IotaSystemState`type (e.g. `IotaSystemStateV2`). +/// 2. Define a data migration function that migrates the old (e.g. `IotaSystemStateV1`) to the new one (e.g. `IotaSystemStateV2`). +/// 3. Replace all uses of `IotaSystemStateV1` with `IotaSystemStateV2` in both iota_system.move and iota_system_state_inner.move, /// with the exception of the `iota_system_state_inner::create` function, which should always return the genesis type. /// 4. Inside `load_inner_maybe_upgrade` function, check the current version in the wrapper, and if it's not the latest version, /// call the data migration function to upgrade the inner object. Make sure to also update the version in the wrapper. /// A detailed example can be found in iota/tests/framework_upgrades/mock_iota_systems/shallow_upgrade. /// Along with the Move change, we also need to update the Rust code to support the new type. This includes: -/// 1. Define a new `IotaSystemStateInner` struct type that matches the new Move type, and implement the IotaSystemStateTrait. +/// 1. Define a new `IotaSystemState` struct type that matches the new Move type, and implement the `IotaSystemStateTrait`. /// 2. Update the `IotaSystemState` struct to include the new version as a new enum variant. /// 3. Update the `get_iota_system_state` function to handle the new version. /// To test that the upgrade will be successful, we need to modify `iota_system_state_production_upgrade_test` test in @@ -29,33 +29,33 @@ /// /// To upgrade Validator type, besides everything above, we also need to: /// 1. Define a new Validator type (e.g. ValidatorV2). -/// 2. Define a data migration function that migrates the old Validator to the new one (i.e. ValidatorV2). -/// 3. Replace all uses of Validator with ValidatorV2 except the genesis creation function. +/// 2. Define a data migration function that migrates the old ValidatorV1 to the new one (i.e. ValidatorV2). +/// 3. Replace all uses of ValidatorV1 with ValidatorV2 except the genesis creation function. /// 4. In validator_wrapper::upgrade_to_latest, check the current version in the wrapper, and if it's not the latest version, /// call the data migration function to upgrade it. /// In Rust, we also need to add a new case in `get_validator_from_table`. -/// Note that it is possible to upgrade IotaSystemStateInner without upgrading Validator, but not the other way around. -/// And when we only upgrade IotaSystemStateInner, the version of Validator in the wrapper will not be updated, and hence may become -/// inconsistent with the version of IotaSystemStateInner. This is fine as long as we don't use the Validator version to determine -/// the IotaSystemStateInner version, or vice versa. +/// Note that it is possible to upgrade IotaSystemStateV1 without upgrading ValidatorV1, but not the other way around. +/// And when we only upgrade IotaSystemStateV1, the version of ValidatorV1 in the wrapper will not be updated, and hence may become +/// inconsistent with the version of IotaSystemStateV1. This is fine as long as we don't use the ValidatorV1 version to determine +/// the IotaSystemStateV1 version, or vice versa. module iota_system::iota_system { use iota::balance::Balance; use iota::coin::Coin; - use iota_system::staking_pool::StakedIota; + use iota_system::staking_pool::StakedIotaV1; use iota::iota::{IOTA, IotaTreasuryCap}; use iota::table::Table; use iota::timelock::SystemTimelockCap; - use iota_system::validator::Validator; + use iota_system::validator::ValidatorV1; use iota_system::validator_cap::UnverifiedValidatorOperationCap; - use iota_system::iota_system_state_inner::{Self, SystemParameters, IotaSystemStateInner, IotaSystemStateInnerV2}; - use iota_system::staking_pool::PoolTokenExchangeRate; + use iota_system::iota_system_state_inner::{Self, SystemParametersV1, IotaSystemStateV1}; + use iota_system::staking_pool::PoolTokenExchangeRateV1; use iota::dynamic_field; use iota::vec_map::VecMap; #[test_only] use iota::balance; - #[test_only] use iota_system::validator_set::ValidatorSet; + #[test_only] use iota_system::validator_set::ValidatorSetV1; #[test_only] use iota::vec_set::VecSet; public struct IotaSystemState has key { @@ -75,11 +75,11 @@ module iota_system::iota_system { public(package) fun create( id: UID, iota_treasury_cap: IotaTreasuryCap, - validators: vector, + validators: vector, storage_fund: Balance, protocol_version: u64, epoch_start_timestamp_ms: u64, - parameters: SystemParameters, + parameters: SystemParametersV1, system_timelock_cap: SystemTimelockCap, ctx: &mut TxContext, ) { @@ -242,7 +242,7 @@ module iota_system::iota_system { stake: Coin, validator_address: address, ctx: &mut TxContext, - ): StakedIota { + ): StakedIotaV1 { let self = load_system_state_mut(wrapper); self.request_add_stake(stake, validator_address, ctx) } @@ -263,7 +263,7 @@ module iota_system::iota_system { /// Withdraw stake from a validator's staking pool. public entry fun request_withdraw_stake( wrapper: &mut IotaSystemState, - staked_iota: StakedIota, + staked_iota: StakedIotaV1, ctx: &mut TxContext, ) { let withdrawn_stake = request_withdraw_stake_non_entry(wrapper, staked_iota, ctx); @@ -273,7 +273,7 @@ module iota_system::iota_system { /// Non-entry version of `request_withdraw_stake` that returns the withdrawn IOTA instead of transferring it to the sender. public fun request_withdraw_stake_non_entry( wrapper: &mut IotaSystemState, - staked_iota: StakedIota, + staked_iota: StakedIotaV1, ctx: &mut TxContext, ) : Balance { let self = load_system_state_mut(wrapper); @@ -514,7 +514,7 @@ module iota_system::iota_system { public fun pool_exchange_rates( wrapper: &mut IotaSystemState, pool_id: &ID - ): &Table { + ): &Table { let self = load_system_state_mut(wrapper); self.pool_exchange_rates(pool_id) } @@ -550,7 +550,7 @@ module iota_system::iota_system { ctx: &mut TxContext, ) : Balance { let self = load_system_state_mut(wrapper); - // Validator will make a special system call with sender set as 0x0. + // ValidatorV1 will make a special system call with sender set as 0x0. assert!(ctx.sender() == @0x0, ENotSystemAddress); let storage_rebate = self.advance_epoch( new_epoch, @@ -568,23 +568,16 @@ module iota_system::iota_system { storage_rebate } - fun load_system_state(self: &mut IotaSystemState): &IotaSystemStateInnerV2 { + fun load_system_state(self: &mut IotaSystemState): &IotaSystemStateV1 { load_inner_maybe_upgrade(self) } - fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateInnerV2 { + fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateV1 { load_inner_maybe_upgrade(self) } - fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateInnerV2 { - if (self.version == 1) { - let v1: IotaSystemStateInner = dynamic_field::remove(&mut self.id, self.version); - let v2 = v1.v1_to_v2(); - self.version = 2; - dynamic_field::add(&mut self.id, self.version, v2); - }; - - let inner: &mut IotaSystemStateInnerV2 = dynamic_field::borrow_mut( + fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateV1 { + let inner: &mut IotaSystemStateV1 = dynamic_field::borrow_mut( &mut self.id, self.version ); @@ -658,26 +651,26 @@ module iota_system::iota_system { #[test_only] /// Return the current validator set - public fun validators(wrapper: &mut IotaSystemState): &ValidatorSet { + public fun validators(wrapper: &mut IotaSystemState): &ValidatorSetV1 { let self = load_system_state(wrapper); self.validators() } #[test_only] /// Return the currently active validator by address - public fun active_validator_by_address(self: &mut IotaSystemState, validator_address: address): &Validator { + public fun active_validator_by_address(self: &mut IotaSystemState, validator_address: address): &ValidatorV1 { validators(self).get_active_validator_ref(validator_address) } #[test_only] /// Return the currently pending validator by address - public fun pending_validator_by_address(self: &mut IotaSystemState, validator_address: address): &Validator { + public fun pending_validator_by_address(self: &mut IotaSystemState, validator_address: address): &ValidatorV1 { validators(self).get_pending_validator_ref(validator_address) } #[test_only] /// Return the currently candidate validator by address - public fun candidate_validator_by_address(self: &mut IotaSystemState, validator_address: address): &Validator { + public fun candidate_validator_by_address(self: &mut IotaSystemState, validator_address: address): &ValidatorV1 { validators(self).get_candidate_validator_ref(validator_address) } diff --git a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move index 62a4e8b60ea..ed99a079788 100644 --- a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move +++ b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move @@ -5,13 +5,13 @@ module iota_system::iota_system_state_inner { use iota::balance::{Self, Balance}; use iota::coin::Coin; - use iota_system::staking_pool::StakedIota; + use iota_system::staking_pool::StakedIotaV1; use iota::iota::{IOTA, IotaTreasuryCap}; - use iota_system::validator::{Self, Validator}; - use iota_system::validator_set::{Self, ValidatorSet}; + use iota_system::validator::{Self, ValidatorV1}; + use iota_system::validator_set::{Self, ValidatorSetV1}; use iota_system::validator_cap::{UnverifiedValidatorOperationCap, ValidatorOperationCap}; - use iota_system::storage_fund::{Self, StorageFund}; - use iota_system::staking_pool::PoolTokenExchangeRate; + use iota_system::storage_fund::{Self, StorageFundV1}; + use iota_system::staking_pool::PoolTokenExchangeRateV1; use iota::vec_map::{Self, VecMap}; use iota::vec_set::{Self, VecSet}; use iota::event; @@ -27,36 +27,7 @@ module iota_system::iota_system_state_inner { const SYSTEM_STATE_VERSION_V1: u64 = 1; /// A list of system config parameters. - public struct SystemParameters has store { - /// The duration of an epoch, in milliseconds. - epoch_duration_ms: u64, - - /// Maximum number of active validators at any moment. - /// We do not allow the number of validators in any epoch to go above this. - max_validator_count: u64, - - /// Lower-bound on the amount of stake required to become a validator. - min_validator_joining_stake: u64, - - /// Validators with stake amount below `validator_low_stake_threshold` are considered to - /// have low stake and will be escorted out of the validator set after being below this - /// threshold for more than `validator_low_stake_grace_period` number of epochs. - validator_low_stake_threshold: u64, - - /// Validators with stake below `validator_very_low_stake_threshold` will be removed - /// immediately at epoch change, no grace period. - validator_very_low_stake_threshold: u64, - - /// A validator can have stake below `validator_low_stake_threshold` - /// for this many epochs before being kicked out. - validator_low_stake_grace_period: u64, - - /// Any extra fields that's not defined statically. - extra_fields: Bag, - } - - /// Added min_validator_count. - public struct SystemParametersV2 has store { + public struct SystemParametersV1 has store { /// The duration of an epoch, in milliseconds. epoch_duration_ms: u64, @@ -88,71 +59,23 @@ module iota_system::iota_system_state_inner { } /// The top-level object containing all information of the Iota system. - public struct IotaSystemStateInner has store { + public struct IotaSystemStateV1 has store { /// The current epoch ID, starting from 0. epoch: u64, /// The current protocol version, starting from 1. protocol_version: u64, /// The current version of the system state data structure type. /// This is always the same as IotaSystemState.version. Keeping a copy here so that - /// we know what version it is by inspecting IotaSystemStateInner as well. + /// we know what version it is by inspecting IotaSystemStateV1 as well. system_state_version: u64, /// The IOTA's TreasuryCap. iota_treasury_cap: IotaTreasuryCap, /// Contains all information about the validators. - validators: ValidatorSet, + validators: ValidatorSetV1, /// The storage fund. - storage_fund: StorageFund, + storage_fund: StorageFundV1, /// A list of system config parameters. - parameters: SystemParameters, - /// The reference gas price for the current epoch. - reference_gas_price: u64, - /// A map storing the records of validator reporting each other. - /// There is an entry in the map for each validator that has been reported - /// at least once. The entry VecSet contains all the validators that reported - /// them. If a validator has never been reported they don't have an entry in this map. - /// This map persists across epoch: a peer continues being in a reported state until the - /// reporter doesn't explicitly remove their report. - /// Note that in case we want to support validator address change in future, - /// the reports should be based on validator ids - validator_report_records: VecMap>, - - /// Whether the system is running in a downgraded safe mode due to a non-recoverable bug. - /// This is set whenever we failed to execute advance_epoch, and ended up executing advance_epoch_safe_mode. - /// It can be reset once we are able to successfully execute advance_epoch. - /// The rest of the fields starting with `safe_mode_` are accmulated during safe mode - /// when advance_epoch_safe_mode is executed. They will eventually be processed once we - /// are out of safe mode. - safe_mode: bool, - safe_mode_storage_charges: Balance, - safe_mode_computation_rewards: Balance, - safe_mode_storage_rebates: u64, - safe_mode_non_refundable_storage_fee: u64, - - /// Unix timestamp of the current epoch start - epoch_start_timestamp_ms: u64, - /// Any extra fields that's not defined statically. - extra_fields: Bag, - } - - /// Uses SystemParametersV2 as the parameters. - public struct IotaSystemStateInnerV2 has store { - /// The current epoch ID, starting from 0. - epoch: u64, - /// The current protocol version, starting from 1. - protocol_version: u64, - /// The current version of the system state data structure type. - /// This is always the same as IotaSystemState.version. Keeping a copy here so that - /// we know what version it is by inspecting IotaSystemStateInner as well. - system_state_version: u64, - /// The IOTA's TreasuryCap. - iota_treasury_cap: IotaTreasuryCap, - /// Contains all information about the validators. - validators: ValidatorSet, - /// The storage fund. - storage_fund: StorageFund, - /// A list of system config parameters. - parameters: SystemParametersV2, + parameters: SystemParametersV1, /// The reference gas price for the current epoch. reference_gas_price: u64, /// A map storing the records of validator reporting each other. @@ -185,7 +108,7 @@ module iota_system::iota_system_state_inner { /// Event containing system-level epoch information, emitted during /// the epoch advancement transaction. - public struct SystemEpochInfoEvent has copy, drop { + public struct SystemEpochInfoEventV1 has copy, drop { epoch: u64, protocol_version: u64, reference_gas_price: u64, @@ -218,17 +141,17 @@ module iota_system::iota_system_state_inner { /// This function will be called only once in genesis. public(package) fun create( iota_treasury_cap: IotaTreasuryCap, - validators: vector, + validators: vector, initial_storage_fund: Balance, protocol_version: u64, epoch_start_timestamp_ms: u64, - parameters: SystemParameters, + parameters: SystemParametersV1, ctx: &mut TxContext, - ): IotaSystemStateInner { + ): IotaSystemStateV1 { let validators = validator_set::new(validators, ctx); let reference_gas_price = validators.derive_reference_gas_price(); // This type is fixed as it's created at genesis. It should not be updated during type upgrade. - let system_state = IotaSystemStateInner { + let system_state = IotaSystemStateV1 { epoch: 0, protocol_version, system_state_version: genesis_system_state_version(), @@ -252,16 +175,17 @@ module iota_system::iota_system_state_inner { public(package) fun create_system_parameters( epoch_duration_ms: u64, - // Validator committee parameters + // ValidatorV1 committee parameters max_validator_count: u64, min_validator_joining_stake: u64, validator_low_stake_threshold: u64, validator_very_low_stake_threshold: u64, validator_low_stake_grace_period: u64, ctx: &mut TxContext, - ): SystemParameters { - SystemParameters { + ): SystemParametersV1 { + SystemParametersV1 { epoch_duration_ms, + min_validator_count: 4, max_validator_count, min_validator_joining_stake, validator_low_stake_threshold, @@ -271,63 +195,6 @@ module iota_system::iota_system_state_inner { } } - public(package) fun v1_to_v2(self: IotaSystemStateInner): IotaSystemStateInnerV2 { - let IotaSystemStateInner { - epoch, - protocol_version, - system_state_version: _, - iota_treasury_cap, - validators, - storage_fund, - parameters, - reference_gas_price, - validator_report_records, - safe_mode, - safe_mode_storage_charges, - safe_mode_computation_rewards, - safe_mode_storage_rebates, - safe_mode_non_refundable_storage_fee, - epoch_start_timestamp_ms, - extra_fields: state_extra_fields, - } = self; - let SystemParameters { - epoch_duration_ms, - max_validator_count, - min_validator_joining_stake, - validator_low_stake_threshold, - validator_very_low_stake_threshold, - validator_low_stake_grace_period, - extra_fields: param_extra_fields, - } = parameters; - IotaSystemStateInnerV2 { - epoch, - protocol_version, - system_state_version: 2, - iota_treasury_cap, - validators, - storage_fund, - parameters: SystemParametersV2 { - epoch_duration_ms, - min_validator_count: 4, - max_validator_count, - min_validator_joining_stake, - validator_low_stake_threshold, - validator_very_low_stake_threshold, - validator_low_stake_grace_period, - extra_fields: param_extra_fields, - }, - reference_gas_price, - validator_report_records, - safe_mode, - safe_mode_storage_charges, - safe_mode_computation_rewards, - safe_mode_storage_rebates, - safe_mode_non_refundable_storage_fee, - epoch_start_timestamp_ms, - extra_fields: state_extra_fields - } - } - // ==== public(package) functions ==== /// Can be called by anyone who wishes to become a validator candidate and starts accuring delegated @@ -337,7 +204,7 @@ module iota_system::iota_system_state_inner { /// Note: `proof_of_possession` MUST be a valid signature using iota_address and protocol_pubkey_bytes. /// To produce a valid PoP, run [fn test_proof_of_possession]. public(package) fun request_add_validator_candidate( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, pubkey_bytes: vector, network_pubkey_bytes: vector, worker_pubkey_bytes: vector, @@ -379,7 +246,7 @@ module iota_system::iota_system_state_inner { /// Called by a validator candidate to remove themselves from the candidacy. After this call /// their staking pool becomes deactivate. public(package) fun request_remove_validator_candidate( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, ctx: &mut TxContext, ) { self.validators.request_remove_validator_candidate(ctx); @@ -390,7 +257,7 @@ module iota_system::iota_system_state_inner { /// stake the validator has doesn't meet the min threshold, or if the number of new validators for the next /// epoch has already reached the maximum. public(package) fun request_add_validator( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, ctx: &TxContext, ) { assert!( @@ -407,7 +274,7 @@ module iota_system::iota_system_state_inner { /// At the end of the epoch, the `validator` object will be returned to the iota_address /// of the validator. public(package) fun request_remove_validator( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, ctx: &TxContext, ) { // Only check min validator condition if the current number of validators satisfy the constraint. @@ -426,7 +293,7 @@ module iota_system::iota_system_state_inner { /// A validator can call this function to submit a new gas price quote, to be /// used for the reference gas price calculation at the end of the epoch. public(package) fun request_set_gas_price( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, cap: &UnverifiedValidatorOperationCap, new_gas_price: u64, ) { @@ -439,7 +306,7 @@ module iota_system::iota_system_state_inner { /// This function is used to set new gas price for candidate validators public(package) fun set_candidate_validator_gas_price( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, cap: &UnverifiedValidatorOperationCap, new_gas_price: u64, ) { @@ -452,7 +319,7 @@ module iota_system::iota_system_state_inner { /// A validator can call this function to set a new commission rate, updated at the end of /// the epoch. public(package) fun request_set_commission_rate( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, new_commission_rate: u64, ctx: &TxContext, ) { @@ -464,7 +331,7 @@ module iota_system::iota_system_state_inner { /// This function is used to set new commission rate for candidate validators public(package) fun set_candidate_validator_commission_rate( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, new_commission_rate: u64, ctx: &TxContext, ) { @@ -474,11 +341,11 @@ module iota_system::iota_system_state_inner { /// Add stake to a validator's staking pool. public(package) fun request_add_stake( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, stake: Coin, validator_address: address, ctx: &mut TxContext, - ) : StakedIota { + ) : StakedIotaV1 { self.validators.request_add_stake( validator_address, stake.into_balance(), @@ -488,20 +355,20 @@ module iota_system::iota_system_state_inner { /// Add stake to a validator's staking pool using multiple coins. public(package) fun request_add_stake_mul_coin( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, stakes: vector>, stake_amount: option::Option, validator_address: address, ctx: &mut TxContext, - ) : StakedIota { + ) : StakedIotaV1 { let balance = extract_coin_balance(stakes, stake_amount, ctx); self.validators.request_add_stake(validator_address, balance, ctx) } /// Withdraw some portion of a stake from a validator's staking pool. public(package) fun request_withdraw_stake( - self: &mut IotaSystemStateInnerV2, - staked_iota: StakedIota, + self: &mut IotaSystemStateV1, + staked_iota: StakedIotaV1, ctx: &TxContext, ) : Balance { self.validators.request_withdraw_stake(staked_iota, ctx) @@ -514,7 +381,7 @@ module iota_system::iota_system_state_inner { /// 3. the cap object is still valid. /// This function is idempotent. public(package) fun report_validator( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, cap: &UnverifiedValidatorOperationCap, reportee_addr: address, ) { @@ -531,7 +398,7 @@ module iota_system::iota_system_state_inner { /// 2. the sender has not previously reported the `reportee_addr`, or /// 3. the cap is not valid public(package) fun undo_report_validator( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, cap: &UnverifiedValidatorOperationCap, reportee_addr: address, ) { @@ -578,7 +445,7 @@ module iota_system::iota_system_state_inner { /// Create a new `UnverifiedValidatorOperationCap`, transfer it to the /// validator and registers it. The original object is thus revoked. public(package) fun rotate_operation_cap( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, ctx: &mut TxContext, ) { let validator = self.validators.get_validator_mut_with_ctx_including_candidates(ctx); @@ -587,7 +454,7 @@ module iota_system::iota_system_state_inner { /// Update a validator's name. public(package) fun update_validator_name( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, name: vector, ctx: &TxContext, ) { @@ -598,7 +465,7 @@ module iota_system::iota_system_state_inner { /// Update a validator's description public(package) fun update_validator_description( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, description: vector, ctx: &TxContext, ) { @@ -608,7 +475,7 @@ module iota_system::iota_system_state_inner { /// Update a validator's image url public(package) fun update_validator_image_url( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, image_url: vector, ctx: &TxContext, ) { @@ -618,7 +485,7 @@ module iota_system::iota_system_state_inner { /// Update a validator's project url public(package) fun update_validator_project_url( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, project_url: vector, ctx: &TxContext, ) { @@ -629,19 +496,19 @@ module iota_system::iota_system_state_inner { /// Update a validator's network address. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_network_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, network_address: vector, ctx: &TxContext, ) { let validator = self.validators.get_validator_mut_with_ctx(ctx); validator.update_next_epoch_network_address(network_address); - let validator :&Validator = validator; // Force immutability for the following call + let validator :&ValidatorV1 = validator; // Force immutability for the following call self.validators.assert_no_pending_or_active_duplicates(validator); } /// Update candidate validator's network address. public(package) fun update_candidate_validator_network_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, network_address: vector, ctx: &TxContext, ) { @@ -652,19 +519,19 @@ module iota_system::iota_system_state_inner { /// Update a validator's p2p address. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_p2p_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, p2p_address: vector, ctx: &TxContext, ) { let validator = self.validators.get_validator_mut_with_ctx(ctx); validator.update_next_epoch_p2p_address(p2p_address); - let validator :&Validator = validator; // Force immutability for the following call + let validator :&ValidatorV1 = validator; // Force immutability for the following call self.validators.assert_no_pending_or_active_duplicates(validator); } /// Update candidate validator's p2p address. public(package) fun update_candidate_validator_p2p_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, p2p_address: vector, ctx: &TxContext, ) { @@ -675,7 +542,7 @@ module iota_system::iota_system_state_inner { /// Update a validator's narwhal primary address. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_primary_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, primary_address: vector, ctx: &TxContext, ) { @@ -685,7 +552,7 @@ module iota_system::iota_system_state_inner { /// Update candidate validator's narwhal primary address. public(package) fun update_candidate_validator_primary_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, primary_address: vector, ctx: &TxContext, ) { @@ -696,7 +563,7 @@ module iota_system::iota_system_state_inner { /// Update a validator's narwhal worker address. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_worker_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, worker_address: vector, ctx: &TxContext, ) { @@ -706,7 +573,7 @@ module iota_system::iota_system_state_inner { /// Update candidate validator's narwhal worker address. public(package) fun update_candidate_validator_worker_address( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, worker_address: vector, ctx: &TxContext, ) { @@ -717,20 +584,20 @@ module iota_system::iota_system_state_inner { /// Update a validator's public key of protocol key and proof of possession. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_protocol_pubkey( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, protocol_pubkey: vector, proof_of_possession: vector, ctx: &TxContext, ) { let validator = self.validators.get_validator_mut_with_ctx(ctx); validator.update_next_epoch_protocol_pubkey(protocol_pubkey, proof_of_possession); - let validator :&Validator = validator; // Force immutability for the following call + let validator :&ValidatorV1 = validator; // Force immutability for the following call self.validators.assert_no_pending_or_active_duplicates(validator); } /// Update candidate validator's public key of protocol key and proof of possession. public(package) fun update_candidate_validator_protocol_pubkey( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, protocol_pubkey: vector, proof_of_possession: vector, ctx: &TxContext, @@ -742,19 +609,19 @@ module iota_system::iota_system_state_inner { /// Update a validator's public key of worker key. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_worker_pubkey( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, worker_pubkey: vector, ctx: &TxContext, ) { let validator = self.validators.get_validator_mut_with_ctx(ctx); validator.update_next_epoch_worker_pubkey(worker_pubkey); - let validator :&Validator = validator; // Force immutability for the following call + let validator :&ValidatorV1 = validator; // Force immutability for the following call self.validators.assert_no_pending_or_active_duplicates(validator); } /// Update candidate validator's public key of worker key. public(package) fun update_candidate_validator_worker_pubkey( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, worker_pubkey: vector, ctx: &TxContext, ) { @@ -765,19 +632,19 @@ module iota_system::iota_system_state_inner { /// Update a validator's public key of network key. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_network_pubkey( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, network_pubkey: vector, ctx: &TxContext, ) { let validator = self.validators.get_validator_mut_with_ctx(ctx); validator.update_next_epoch_network_pubkey(network_pubkey); - let validator :&Validator = validator; // Force immutability for the following call + let validator :&ValidatorV1 = validator; // Force immutability for the following call self.validators.assert_no_pending_or_active_duplicates(validator); } /// Update candidate validator's public key of network key. public(package) fun update_candidate_validator_network_pubkey( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, network_pubkey: vector, ctx: &TxContext, ) { @@ -796,7 +663,7 @@ module iota_system::iota_system_state_inner { /// 5. Burn any leftover rewards. /// 6. Update all validators. public(package) fun advance_epoch( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, new_epoch: u64, next_protocol_version: u64, validator_target_reward: u64, @@ -874,7 +741,7 @@ module iota_system::iota_system_state_inner { ); event::emit( - SystemEpochInfoEvent { + SystemEpochInfoEventV1 { epoch: self.epoch, protocol_version: self.protocol_version, reference_gas_price: self.reference_gas_price, @@ -925,15 +792,15 @@ module iota_system::iota_system_state_inner { /// Return the current epoch number. Useful for applications that need a coarse-grained concept of time, /// since epochs are ever-increasing and epoch changes are intended to happen every 24 hours. - public(package) fun epoch(self: &IotaSystemStateInnerV2): u64 { + public(package) fun epoch(self: &IotaSystemStateV1): u64 { self.epoch } - public(package) fun protocol_version(self: &IotaSystemStateInnerV2): u64 { + public(package) fun protocol_version(self: &IotaSystemStateV1): u64 { self.protocol_version } - public(package) fun system_state_version(self: &IotaSystemStateInnerV2): u64 { + public(package) fun system_state_version(self: &IotaSystemStateV1): u64 { self.system_state_version } @@ -944,19 +811,19 @@ module iota_system::iota_system_state_inner { } /// Returns unix timestamp of the start of current epoch - public(package) fun epoch_start_timestamp_ms(self: &IotaSystemStateInnerV2): u64 { + public(package) fun epoch_start_timestamp_ms(self: &IotaSystemStateV1): u64 { self.epoch_start_timestamp_ms } /// Returns the total amount staked with `validator_addr`. /// Aborts if `validator_addr` is not an active validator. - public(package) fun validator_stake_amount(self: &IotaSystemStateInnerV2, validator_addr: address): u64 { + public(package) fun validator_stake_amount(self: &IotaSystemStateV1, validator_addr: address): u64 { self.validators.validator_total_stake_amount(validator_addr) } /// Returns the voting power for `validator_addr`. /// Aborts if `validator_addr` is not an active validator. - public(package) fun active_validator_voting_powers(self: &IotaSystemStateInnerV2): VecMap { + public(package) fun active_validator_voting_powers(self: &IotaSystemStateV1): VecMap { let mut active_validators = active_validator_addresses(self); let mut voting_powers = vec_map::empty(); while (!vector::is_empty(&active_validators)) { @@ -969,24 +836,24 @@ module iota_system::iota_system_state_inner { /// Returns the staking pool id of a given validator. /// Aborts if `validator_addr` is not an active validator. - public(package) fun validator_staking_pool_id(self: &IotaSystemStateInnerV2, validator_addr: address): ID { + public(package) fun validator_staking_pool_id(self: &IotaSystemStateV1, validator_addr: address): ID { self.validators.validator_staking_pool_id(validator_addr) } /// Returns reference to the staking pool mappings that map pool ids to active validator addresses - public(package) fun validator_staking_pool_mappings(self: &IotaSystemStateInnerV2): &Table { + public(package) fun validator_staking_pool_mappings(self: &IotaSystemStateV1): &Table { self.validators.staking_pool_mappings() } /// Returns the total iota supply. - public(package) fun get_total_iota_supply(self: &IotaSystemStateInnerV2): u64 { + public(package) fun get_total_iota_supply(self: &IotaSystemStateV1): u64 { self.iota_treasury_cap.total_supply() } /// Returns all the validators who are currently reporting `addr` - public(package) fun get_reporters_of(self: &IotaSystemStateInnerV2, addr: address): VecSet
{ + public(package) fun get_reporters_of(self: &IotaSystemStateV1, addr: address): VecSet
{ if (self.validator_report_records.contains(&addr)) { self.validator_report_records[&addr] @@ -995,23 +862,23 @@ module iota_system::iota_system_state_inner { } } - public(package) fun get_storage_fund_total_balance(self: &IotaSystemStateInnerV2): u64 { + public(package) fun get_storage_fund_total_balance(self: &IotaSystemStateV1): u64 { self.storage_fund.total_balance() } - public(package) fun get_storage_fund_object_rebates(self: &IotaSystemStateInnerV2): u64 { + public(package) fun get_storage_fund_object_rebates(self: &IotaSystemStateV1): u64 { self.storage_fund.total_object_storage_rebates() } public(package) fun pool_exchange_rates( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, pool_id: &ID - ): &Table { + ): &Table { let validators = &mut self.validators; validators.pool_exchange_rates(pool_id) } - public(package) fun active_validator_addresses(self: &IotaSystemStateInnerV2): vector
{ + public(package) fun active_validator_addresses(self: &IotaSystemStateV1): vector
{ let validator_set = &self.validators; validator_set.active_validator_addresses() } @@ -1041,36 +908,36 @@ module iota_system::iota_system_state_inner { #[test_only] /// Return the current validator set - public(package) fun validators(self: &IotaSystemStateInnerV2): &ValidatorSet { + public(package) fun validators(self: &IotaSystemStateV1): &ValidatorSetV1 { &self.validators } #[test_only] /// Return the currently active validator by address - public(package) fun active_validator_by_address(self: &IotaSystemStateInnerV2, validator_address: address): &Validator { + public(package) fun active_validator_by_address(self: &IotaSystemStateV1, validator_address: address): &ValidatorV1 { self.validators().get_active_validator_ref(validator_address) } #[test_only] /// Return the currently pending validator by address - public(package) fun pending_validator_by_address(self: &IotaSystemStateInnerV2, validator_address: address): &Validator { + public(package) fun pending_validator_by_address(self: &IotaSystemStateV1, validator_address: address): &ValidatorV1 { self.validators().get_pending_validator_ref(validator_address) } #[test_only] /// Return the currently candidate validator by address - public(package) fun candidate_validator_by_address(self: &IotaSystemStateInnerV2, validator_address: address): &Validator { + public(package) fun candidate_validator_by_address(self: &IotaSystemStateV1, validator_address: address): &ValidatorV1 { validators(self).get_candidate_validator_ref(validator_address) } #[test_only] - public(package) fun set_epoch_for_testing(self: &mut IotaSystemStateInnerV2, epoch_num: u64) { + public(package) fun set_epoch_for_testing(self: &mut IotaSystemStateV1, epoch_num: u64) { self.epoch = epoch_num } #[test_only] public(package) fun request_add_validator_for_testing( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, min_joining_stake_for_testing: u64, ctx: &TxContext, ) { @@ -1087,7 +954,7 @@ module iota_system::iota_system_state_inner { // in the process. #[test_only] public(package) fun request_add_validator_candidate_for_testing( - self: &mut IotaSystemStateInnerV2, + self: &mut IotaSystemStateV1, pubkey_bytes: vector, network_pubkey_bytes: vector, worker_pubkey_bytes: vector, diff --git a/crates/iota-framework/packages/iota-system/sources/staking_pool.move b/crates/iota-framework/packages/iota-system/sources/staking_pool.move index 6e41baee1f1..0839b880619 100644 --- a/crates/iota-framework/packages/iota-system/sources/staking_pool.move +++ b/crates/iota-framework/packages/iota-system/sources/staking_pool.move @@ -10,7 +10,7 @@ module iota_system::staking_pool { use iota::bag::Bag; use iota::bag; - /// StakedIota objects cannot be split to below this amount. + /// StakedIotaV1 objects cannot be split to below this amount. const MIN_STAKING_THRESHOLD: u64 = 1_000_000_000; // 1 IOTA const EInsufficientPoolTokenBalance: u64 = 0; @@ -34,7 +34,7 @@ module iota_system::staking_pool { const EStakedIotaBelowThreshold: u64 = 18; /// A staking pool embedded in each validator struct in the system state object. - public struct StakingPool has key, store { + public struct StakingPoolV1 has key, store { id: UID, /// The epoch at which this pool became active. /// The value is `None` if the pool is pre-active and `Some()` if active or inactive. @@ -43,7 +43,7 @@ module iota_system::staking_pool { /// `Some()` if in-active, and it was de-activated at epoch ``. deactivation_epoch: Option, /// The total number of IOTA tokens in this pool, including the IOTA in the rewards_pool, as well as in all the principal - /// in the `StakedIota` object, updated at epoch boundaries. + /// in the `StakedIotaV1` object, updated at epoch boundaries. iota_balance: u64, /// The epoch stake rewards will be added here at the end of each epoch. rewards_pool: Balance, @@ -52,7 +52,7 @@ module iota_system::staking_pool { /// Exchange rate history of previous epochs. Key is the epoch number. /// The entries start from the `activation_epoch` of this pool and contains exchange rates at the beginning of each epoch, /// i.e., right after the rewards for the previous epoch have been deposited into the pool. - exchange_rates: Table, + exchange_rates: Table, /// Pending stake amount for this epoch, emptied at epoch boundaries. pending_stake: u64, /// Pending stake withdrawn during the current epoch, emptied at epoch boundaries. @@ -65,13 +65,13 @@ module iota_system::staking_pool { } /// Struct representing the exchange rate of the stake pool token to IOTA. - public struct PoolTokenExchangeRate has store, copy, drop { + public struct PoolTokenExchangeRateV1 has store, copy, drop { iota_amount: u64, pool_token_amount: u64, } /// A self-custodial object holding the staked IOTA tokens. - public struct StakedIota has key, store { + public struct StakedIotaV1 has key, store { id: UID, /// ID of the staking pool we are staking with. pool_id: ID, @@ -84,9 +84,9 @@ module iota_system::staking_pool { // ==== initializer ==== /// Create a new, empty staking pool. - public(package) fun new(ctx: &mut TxContext) : StakingPool { + public(package) fun new(ctx: &mut TxContext) : StakingPoolV1 { let exchange_rates = table::new(ctx); - StakingPool { + StakingPoolV1 { id: object::new(ctx), activation_epoch: option::none(), deactivation_epoch: option::none(), @@ -105,15 +105,15 @@ module iota_system::staking_pool { /// Request to stake to a staking pool. The stake starts counting at the beginning of the next epoch, public(package) fun request_add_stake( - pool: &mut StakingPool, + pool: &mut StakingPoolV1, stake: Balance, stake_activation_epoch: u64, ctx: &mut TxContext - ) : StakedIota { + ) : StakedIotaV1 { let iota_amount = stake.value(); assert!(!is_inactive(pool), EDelegationToInactivePool); assert!(iota_amount > 0, EDelegationOfZeroIota); - let staked_iota = StakedIota { + let staked_iota = StakedIotaV1 { id: object::new(ctx), pool_id: object::id(pool), stake_activation_epoch, @@ -127,8 +127,8 @@ module iota_system::staking_pool { /// Both the principal and corresponding rewards in IOTA are withdrawn. /// A proportional amount of pool token withdraw is recorded and processed at epoch change time. public(package) fun request_withdraw_stake( - pool: &mut StakingPool, - staked_iota: StakedIota, + pool: &mut StakingPoolV1, + staked_iota: StakedIotaV1, ctx: &TxContext ) : Balance { // stake is inactive @@ -159,12 +159,12 @@ module iota_system::staking_pool { principal_withdraw } - /// Withdraw the principal IOTA stored in the StakedIota object, and calculate the corresponding amount of pool + /// Withdraw the principal IOTA stored in the StakedIotaV1 object, and calculate the corresponding amount of pool /// tokens using exchange rate at staking epoch. /// Returns values are amount of pool tokens withdrawn and withdrawn principal portion of IOTA. public(package) fun withdraw_from_principal( - pool: &StakingPool, - staked_iota: StakedIota, + pool: &StakingPoolV1, + staked_iota: StakedIotaV1, ) : (u64, Balance) { // Check that the stake information matches the pool. @@ -183,8 +183,8 @@ module iota_system::staking_pool { ) } - fun unwrap_staked_iota(staked_iota: StakedIota): Balance { - let StakedIota { + fun unwrap_staked_iota(staked_iota: StakedIotaV1): Balance { + let StakedIotaV1 { id, pool_id: _, stake_activation_epoch: _, @@ -194,31 +194,31 @@ module iota_system::staking_pool { principal } - /// Allows calling `.into_balance()` on `StakedIota` to invoke `unwrap_staked_iota` - public use fun unwrap_staked_iota as StakedIota.into_balance; + /// Allows calling `.into_balance()` on `StakedIotaV1` to invoke `unwrap_staked_iota` + public use fun unwrap_staked_iota as StakedIotaV1.into_balance; // ==== functions called at epoch boundaries === /// Called at epoch advancement times to add rewards (in IOTA) to the staking pool. - public(package) fun deposit_rewards(pool: &mut StakingPool, rewards: Balance) { + public(package) fun deposit_rewards(pool: &mut StakingPoolV1, rewards: Balance) { pool.iota_balance = pool.iota_balance + rewards.value(); pool.rewards_pool.join(rewards); } - public(package) fun process_pending_stakes_and_withdraws(pool: &mut StakingPool, ctx: &TxContext) { + public(package) fun process_pending_stakes_and_withdraws(pool: &mut StakingPoolV1, ctx: &TxContext) { let new_epoch = ctx.epoch() + 1; process_pending_stake_withdraw(pool); process_pending_stake(pool); pool.exchange_rates.add( new_epoch, - PoolTokenExchangeRate { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }, + PoolTokenExchangeRateV1 { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }, ); check_balance_invariants(pool, new_epoch); } /// Called at epoch boundaries to process pending stake withdraws requested during the epoch. /// Also called immediately upon withdrawal if the pool is inactive. - fun process_pending_stake_withdraw(pool: &mut StakingPool) { + fun process_pending_stake_withdraw(pool: &mut StakingPoolV1) { pool.iota_balance = pool.iota_balance - pool.pending_total_iota_withdraw; pool.pool_token_balance = pool.pool_token_balance - pool.pending_pool_token_withdraw; pool.pending_total_iota_withdraw = 0; @@ -226,10 +226,10 @@ module iota_system::staking_pool { } /// Called at epoch boundaries to process the pending stake. - public(package) fun process_pending_stake(pool: &mut StakingPool) { + public(package) fun process_pending_stake(pool: &mut StakingPoolV1) { // Use the most up to date exchange rate with the rewards deposited and withdraws effectuated. let latest_exchange_rate = - PoolTokenExchangeRate { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }; + PoolTokenExchangeRateV1 { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }; pool.iota_balance = pool.iota_balance + pool.pending_stake; pool.pool_token_balance = get_token_amount(&latest_exchange_rate, pool.iota_balance); pool.pending_stake = 0; @@ -241,9 +241,9 @@ module iota_system::staking_pool { /// 2. Using the above number and the given `principal_withdraw_amount`, calculates the rewards portion of the /// stake we should withdraw. /// 3. Withdraws the rewards portion from the rewards pool at the current exchange rate. We only withdraw the rewards - /// portion because the principal portion was already taken out of the staker's self custodied StakedIota. + /// portion because the principal portion was already taken out of the staker's self custodied StakedIotaV1. fun withdraw_rewards( - pool: &mut StakingPool, + pool: &mut StakingPoolV1, principal_withdraw_amount: u64, pool_token_withdraw_amount: u64, epoch: u64, @@ -264,7 +264,7 @@ module iota_system::staking_pool { // ==== preactive pool related ==== /// Called by `validator` module to activate a staking pool. - public(package) fun activate_staking_pool(pool: &mut StakingPool, activation_epoch: u64) { + public(package) fun activate_staking_pool(pool: &mut StakingPoolV1, activation_epoch: u64) { // Add the initial exchange rate to the table. pool.exchange_rates.add( activation_epoch, @@ -282,7 +282,7 @@ module iota_system::staking_pool { /// Deactivate a staking pool by setting the `deactivation_epoch`. After /// this pool deactivation, the pool stops earning rewards. Only stake /// withdraws can be made to the pool. - public(package) fun deactivate_staking_pool(pool: &mut StakingPool, deactivation_epoch: u64) { + public(package) fun deactivate_staking_pool(pool: &mut StakingPoolV1, deactivation_epoch: u64) { // We can't deactivate an already deactivated pool. assert!(!is_inactive(pool), EDeactivationOfInactivePool); pool.deactivation_epoch = option::some(deactivation_epoch); @@ -290,40 +290,40 @@ module iota_system::staking_pool { // ==== getters and misc utility functions ==== - public fun iota_balance(pool: &StakingPool): u64 { pool.iota_balance } + public fun iota_balance(pool: &StakingPoolV1): u64 { pool.iota_balance } - public fun pool_id(staked_iota: &StakedIota): ID { staked_iota.pool_id } + public fun pool_id(staked_iota: &StakedIotaV1): ID { staked_iota.pool_id } - public fun staked_iota_amount(staked_iota: &StakedIota): u64 { staked_iota.principal.value() } + public fun staked_iota_amount(staked_iota: &StakedIotaV1): u64 { staked_iota.principal.value() } - /// Allows calling `.amount()` on `StakedIota` to invoke `staked_iota_amount` - public use fun staked_iota_amount as StakedIota.amount; + /// Allows calling `.amount()` on `StakedIotaV1` to invoke `staked_iota_amount` + public use fun staked_iota_amount as StakedIotaV1.amount; - public fun stake_activation_epoch(staked_iota: &StakedIota): u64 { + public fun stake_activation_epoch(staked_iota: &StakedIotaV1): u64 { staked_iota.stake_activation_epoch } /// Returns true if the input staking pool is preactive. - public fun is_preactive(pool: &StakingPool): bool{ + public fun is_preactive(pool: &StakingPoolV1): bool{ pool.activation_epoch.is_none() } /// Returns true if the input staking pool is inactive. - public fun is_inactive(pool: &StakingPool): bool { + public fun is_inactive(pool: &StakingPoolV1): bool { pool.deactivation_epoch.is_some() } - /// Split StakedIota `self` to two parts, one with principal `split_amount`, + /// Split StakedIotaV1 `self` to two parts, one with principal `split_amount`, /// and the remaining principal is left in `self`. - /// All the other parameters of the StakedIota like `stake_activation_epoch` or `pool_id` remain the same. - public fun split(self: &mut StakedIota, split_amount: u64, ctx: &mut TxContext): StakedIota { + /// All the other parameters of the StakedIotaV1 like `stake_activation_epoch` or `pool_id` remain the same. + public fun split(self: &mut StakedIotaV1, split_amount: u64, ctx: &mut TxContext): StakedIotaV1 { let original_amount = self.principal.value(); assert!(split_amount <= original_amount, EInsufficientIotaTokenBalance); let remaining_amount = original_amount - split_amount; // Both resulting parts should have at least MIN_STAKING_THRESHOLD. assert!(remaining_amount >= MIN_STAKING_THRESHOLD, EStakedIotaBelowThreshold); assert!(split_amount >= MIN_STAKING_THRESHOLD, EStakedIotaBelowThreshold); - StakedIota { + StakedIotaV1 { id: object::new(ctx), pool_id: self.pool_id, stake_activation_epoch: self.stake_activation_epoch, @@ -331,20 +331,20 @@ module iota_system::staking_pool { } } - /// Split the given StakedIota to the two parts, one with principal `split_amount`, + /// Split the given StakedIotaV1 to the two parts, one with principal `split_amount`, /// transfer the newly split part to the sender address. - public entry fun split_staked_iota(stake: &mut StakedIota, split_amount: u64, ctx: &mut TxContext) { + public entry fun split_staked_iota(stake: &mut StakedIotaV1, split_amount: u64, ctx: &mut TxContext) { transfer::transfer(split(stake, split_amount, ctx), ctx.sender()); } - /// Allows calling `.split_to_sender()` on `StakedIota` to invoke `split_staked_iota` - public use fun split_staked_iota as StakedIota.split_to_sender; + /// Allows calling `.split_to_sender()` on `StakedIotaV1` to invoke `split_staked_iota` + public use fun split_staked_iota as StakedIotaV1.split_to_sender; /// Consume the staked iota `other` and add its value to `self`. /// Aborts if some of the staking parameters are incompatible (pool id, stake activation epoch, etc.) - public entry fun join_staked_iota(self: &mut StakedIota, other: StakedIota) { + public entry fun join_staked_iota(self: &mut StakedIotaV1, other: StakedIotaV1) { assert!(is_equal_staking_metadata(self, &other), EIncompatibleStakedIota); - let StakedIota { + let StakedIotaV1 { id, pool_id: _, stake_activation_epoch: _, @@ -355,16 +355,16 @@ module iota_system::staking_pool { self.principal.join(principal); } - /// Allows calling `.join()` on `StakedIota` to invoke `join_staked_iota` - public use fun join_staked_iota as StakedIota.join; + /// Allows calling `.join()` on `StakedIotaV1` to invoke `join_staked_iota` + public use fun join_staked_iota as StakedIotaV1.join; /// Returns true if all the staking parameters of the staked iota except the principal are identical - public fun is_equal_staking_metadata(self: &StakedIota, other: &StakedIota): bool { + public fun is_equal_staking_metadata(self: &StakedIotaV1, other: &StakedIotaV1): bool { (self.pool_id == other.pool_id) && (self.stake_activation_epoch == other.stake_activation_epoch) } - public fun pool_token_exchange_rate_at_epoch(pool: &StakingPool, epoch: u64): PoolTokenExchangeRate { + public fun pool_token_exchange_rate_at_epoch(pool: &StakingPoolV1, epoch: u64): PoolTokenExchangeRateV1 { // If the pool is preactive then the exchange rate is always 1:1. if (is_preactive_at_epoch(pool, epoch)) { return initial_exchange_rate() @@ -385,34 +385,34 @@ module iota_system::staking_pool { } /// Returns the total value of the pending staking requests for this staking pool. - public fun pending_stake_amount(staking_pool: &StakingPool): u64 { + public fun pending_stake_amount(staking_pool: &StakingPoolV1): u64 { staking_pool.pending_stake } /// Returns the total withdrawal from the staking pool this epoch. - public fun pending_stake_withdraw_amount(staking_pool: &StakingPool): u64 { + public fun pending_stake_withdraw_amount(staking_pool: &StakingPoolV1): u64 { staking_pool.pending_total_iota_withdraw } - public(package) fun exchange_rates(pool: &StakingPool): &Table { + public(package) fun exchange_rates(pool: &StakingPoolV1): &Table { &pool.exchange_rates } - public fun iota_amount(exchange_rate: &PoolTokenExchangeRate): u64 { + public fun iota_amount(exchange_rate: &PoolTokenExchangeRateV1): u64 { exchange_rate.iota_amount } - public fun pool_token_amount(exchange_rate: &PoolTokenExchangeRate): u64 { + public fun pool_token_amount(exchange_rate: &PoolTokenExchangeRateV1): u64 { exchange_rate.pool_token_amount } /// Returns true if the provided staking pool is preactive at the provided epoch. - fun is_preactive_at_epoch(pool: &StakingPool, epoch: u64): bool{ + fun is_preactive_at_epoch(pool: &StakingPoolV1, epoch: u64): bool{ // Either the pool is currently preactive or the pool's starting epoch is later than the provided epoch. is_preactive(pool) || (*pool.activation_epoch.borrow() > epoch) } - fun get_iota_amount(exchange_rate: &PoolTokenExchangeRate, token_amount: u64): u64 { + fun get_iota_amount(exchange_rate: &PoolTokenExchangeRateV1, token_amount: u64): u64 { // When either amount is 0, that means we have no stakes with this pool. // The other amount might be non-zero when there's dust left in the pool. if (exchange_rate.iota_amount == 0 || exchange_rate.pool_token_amount == 0) { @@ -424,7 +424,7 @@ module iota_system::staking_pool { res as u64 } - fun get_token_amount(exchange_rate: &PoolTokenExchangeRate, iota_amount: u64): u64 { + fun get_token_amount(exchange_rate: &PoolTokenExchangeRateV1, iota_amount: u64): u64 { // When either amount is 0, that means we have no stakes with this pool. // The other amount might be non-zero when there's dust left in the pool. if (exchange_rate.iota_amount == 0 || exchange_rate.pool_token_amount == 0) { @@ -436,11 +436,11 @@ module iota_system::staking_pool { res as u64 } - fun initial_exchange_rate(): PoolTokenExchangeRate { - PoolTokenExchangeRate { iota_amount: 0, pool_token_amount: 0 } + fun initial_exchange_rate(): PoolTokenExchangeRateV1 { + PoolTokenExchangeRateV1 { iota_amount: 0, pool_token_amount: 0 } } - fun check_balance_invariants(pool: &StakingPool, epoch: u64) { + fun check_balance_invariants(pool: &StakingPoolV1, epoch: u64) { let exchange_rate = pool_token_exchange_rate_at_epoch(pool, epoch); // check that the pool token balance and iota balance ratio matches the exchange rate stored. let expected = get_token_amount(&exchange_rate, pool.iota_balance); @@ -453,8 +453,8 @@ module iota_system::staking_pool { // Given the `staked_iota` receipt calculate the current rewards (in terms of IOTA) for it. #[test_only] public fun calculate_rewards( - pool: &StakingPool, - staked_iota: &StakedIota, + pool: &StakingPoolV1, + staked_iota: &StakedIotaV1, current_epoch: u64, ): u64 { let staked_amount = staked_iota_amount(staked_iota); diff --git a/crates/iota-framework/packages/iota-system/sources/storage_fund.move b/crates/iota-framework/packages/iota-system/sources/storage_fund.move index af347f40594..c25a5ebeabf 100644 --- a/crates/iota-framework/packages/iota-system/sources/storage_fund.move +++ b/crates/iota-framework/packages/iota-system/sources/storage_fund.move @@ -14,14 +14,14 @@ module iota_system::storage_fund { /// the non-refundable portion taken out and put into `non_refundable_balance`. /// - `non_refundable_balance` contains any remaining inflow of the storage fund that should not /// be taken out of the fund. - public struct StorageFund has store { + public struct StorageFundV1 has store { total_object_storage_rebates: Balance, non_refundable_balance: Balance, } /// Called by `iota_system` at genesis time. - public(package) fun new(initial_fund: Balance) : StorageFund { - StorageFund { + public(package) fun new(initial_fund: Balance) : StorageFundV1 { + StorageFundV1 { // At the beginning there's no object in the storage yet total_object_storage_rebates: balance::zero(), non_refundable_balance: initial_fund, @@ -30,7 +30,7 @@ module iota_system::storage_fund { /// Called by `iota_system` at epoch change times to process the inflows and outflows of storage fund. public(package) fun advance_epoch( - self: &mut StorageFund, + self: &mut StorageFundV1, storage_charges: Balance, storage_rebate_amount: u64, non_refundable_storage_fee_amount: u64, @@ -53,11 +53,11 @@ module iota_system::storage_fund { storage_rebate } - public fun total_object_storage_rebates(self: &StorageFund): u64 { + public fun total_object_storage_rebates(self: &StorageFundV1): u64 { self.total_object_storage_rebates.value() } - public fun total_balance(self: &StorageFund): u64 { + public fun total_balance(self: &StorageFundV1): u64 { self.total_object_storage_rebates.value() + self.non_refundable_balance.value() } } diff --git a/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move b/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move index abc3e10a107..4a6e06f0d16 100644 --- a/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move +++ b/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move @@ -10,19 +10,19 @@ module iota_system::timelocked_staking { use iota::timelock::{Self, TimeLock}; use iota_system::iota_system::{IotaSystemState}; - use iota_system::staking_pool::StakedIota; - use iota_system::validator::{Validator}; + use iota_system::staking_pool::StakedIotaV1; + use iota_system::validator::{ValidatorV1}; /// For when trying to stake an expired time-locked balance. const ETimeLockShouldNotBeExpired: u64 = 0; - /// Incompatible objects when joining TimelockedStakedIota + /// Incompatible objects when joining TimelockedStakedIotaV1 const EIncompatibleTimelockedStakedIota: u64 = 1; /// A self-custodial object holding the timelocked staked IOTA tokens. - public struct TimelockedStakedIota has key { + public struct TimelockedStakedIotaV1 has key { id: UID, /// A self-custodial object holding the staked IOTA tokens. - staked_iota: StakedIota, + staked_iota: StakedIotaV1, /// This is the epoch time stamp of when the lock expires. expiration_timestamp_ms: u64, /// Timelock related label. @@ -76,7 +76,7 @@ module iota_system::timelocked_staking { /// Withdraw a time-locked stake from a validator's staking pool. public entry fun request_withdraw_stake( iota_system: &mut IotaSystemState, - timelocked_staked_iota: TimelockedStakedIota, + timelocked_staked_iota: TimelockedStakedIotaV1, ctx: &mut TxContext, ) { // Withdraw the time-locked balance. @@ -102,7 +102,7 @@ module iota_system::timelocked_staking { timelocked_balance: TimeLock>, validator_address: address, ctx: &mut TxContext, - ) : TimelockedStakedIota { + ) : TimelockedStakedIotaV1 { // Check the preconditions. assert!(timelocked_balance.is_locked(ctx), ETimeLockShouldNotBeExpired); @@ -118,7 +118,7 @@ module iota_system::timelocked_staking { ); // Create and return a receipt. - TimelockedStakedIota { + TimelockedStakedIotaV1 { id: object::new(ctx), staked_iota, expiration_timestamp_ms, @@ -133,7 +133,7 @@ module iota_system::timelocked_staking { mut timelocked_balances: vector>>, validator_address: address, ctx: &mut TxContext, - ) : vector { + ) : vector { // Create a vector to store the results. let mut result = vector[]; @@ -164,10 +164,10 @@ module iota_system::timelocked_staking { /// instead of transferring it to the sender. public fun request_withdraw_stake_non_entry( iota_system: &mut IotaSystemState, - timelocked_staked_iota: TimelockedStakedIota, + timelocked_staked_iota: TimelockedStakedIotaV1, ctx: &mut TxContext, ) : (TimeLock>, Balance) { - // Unpack the `TimelockedStakedIota` instance. + // Unpack the `TimelockedStakedIotaV1` instance. let (staked_iota, expiration_timestamp_ms, label) = timelocked_staked_iota.unpack(); // Store the original stake amount. @@ -185,15 +185,15 @@ module iota_system::timelocked_staking { (timelock::system_pack(sys_timelock_cap, principal, expiration_timestamp_ms, label, ctx), withdraw_stake) } - // === TimelockedStakedIota balance functions === + // === TimelockedStakedIotaV1 balance functions === - /// Split `TimelockedStakedIota` into two parts, one with principal `split_amount`, + /// Split `TimelockedStakedIotaV1` into two parts, one with principal `split_amount`, /// and the remaining principal is left in `self`. - /// All the other parameters of the `TimelockedStakedIota` like `stake_activation_epoch` or `pool_id` remain the same. - public fun split(self: &mut TimelockedStakedIota, split_amount: u64, ctx: &mut TxContext): TimelockedStakedIota { + /// All the other parameters of the `TimelockedStakedIotaV1` like `stake_activation_epoch` or `pool_id` remain the same. + public fun split(self: &mut TimelockedStakedIotaV1, split_amount: u64, ctx: &mut TxContext): TimelockedStakedIotaV1 { let split_stake = self.staked_iota.split(split_amount, ctx); - TimelockedStakedIota { + TimelockedStakedIotaV1 { id: object::new(ctx), staked_iota: split_stake, expiration_timestamp_ms: self.expiration_timestamp_ms, @@ -201,21 +201,21 @@ module iota_system::timelocked_staking { } } - /// Split the given `TimelockedStakedIota` to the two parts, one with principal `split_amount`, + /// Split the given `TimelockedStakedIotaV1` to the two parts, one with principal `split_amount`, /// transfer the newly split part to the sender address. - public entry fun split_staked_iota(stake: &mut TimelockedStakedIota, split_amount: u64, ctx: &mut TxContext) { + public entry fun split_staked_iota(stake: &mut TimelockedStakedIotaV1, split_amount: u64, ctx: &mut TxContext) { split(stake, split_amount, ctx).transfer_to_sender(ctx); } - /// Allows calling `.split_to_sender()` on `TimelockedStakedIota` to invoke `split_staked_iota` - public use fun split_staked_iota as TimelockedStakedIota.split_to_sender; + /// Allows calling `.split_to_sender()` on `TimelockedStakedIotaV1` to invoke `split_staked_iota` + public use fun split_staked_iota as TimelockedStakedIotaV1.split_to_sender; /// Consume the staked iota `other` and add its value to `self`. /// Aborts if some of the staking parameters are incompatible (pool id, stake activation epoch, etc.) - public entry fun join_staked_iota(self: &mut TimelockedStakedIota, other: TimelockedStakedIota) { + public entry fun join_staked_iota(self: &mut TimelockedStakedIotaV1, other: TimelockedStakedIotaV1) { assert!(self.is_equal_staking_metadata(&other), EIncompatibleTimelockedStakedIota); - let TimelockedStakedIota { + let TimelockedStakedIotaV1 { id, staked_iota, expiration_timestamp_ms: _, @@ -227,57 +227,57 @@ module iota_system::timelocked_staking { self.staked_iota.join(staked_iota); } - /// Allows calling `.join()` on `TimelockedStakedIota` to invoke `join_staked_iota` - public use fun join_staked_iota as TimelockedStakedIota.join; + /// Allows calling `.join()` on `TimelockedStakedIotaV1` to invoke `join_staked_iota` + public use fun join_staked_iota as TimelockedStakedIotaV1.join; - // === TimelockedStakedIota public utilities === + // === TimelockedStakedIotaV1 public utilities === - /// A utility function to transfer a `TimelockedStakedIota`. - public fun transfer_to_sender(stake: TimelockedStakedIota, ctx: &TxContext) { + /// A utility function to transfer a `TimelockedStakedIotaV1`. + public fun transfer_to_sender(stake: TimelockedStakedIotaV1, ctx: &TxContext) { transfer(stake, ctx.sender()) } - /// A utility function to transfer multiple `TimelockedStakedIota`. - public fun transfer_to_sender_multiple(stakes: vector, ctx: &TxContext) { + /// A utility function to transfer multiple `TimelockedStakedIotaV1`. + public fun transfer_to_sender_multiple(stakes: vector, ctx: &TxContext) { transfer_multiple(stakes, ctx.sender()) } /// A utility function that returns true if all the staking parameters /// of the staked iota except the principal are identical - public fun is_equal_staking_metadata(self: &TimelockedStakedIota, other: &TimelockedStakedIota): bool { + public fun is_equal_staking_metadata(self: &TimelockedStakedIotaV1, other: &TimelockedStakedIotaV1): bool { self.staked_iota.is_equal_staking_metadata(&other.staked_iota) && (self.expiration_timestamp_ms == other.expiration_timestamp_ms) && (self.label() == other.label()) } - // === TimelockedStakedIota getters === + // === TimelockedStakedIotaV1 getters === - /// Function to get the pool id of a `TimelockedStakedIota`. - public fun pool_id(self: &TimelockedStakedIota): ID { self.staked_iota.pool_id() } + /// Function to get the pool id of a `TimelockedStakedIotaV1`. + public fun pool_id(self: &TimelockedStakedIotaV1): ID { self.staked_iota.pool_id() } - /// Function to get the staked iota amount of a `TimelockedStakedIota`. - public fun staked_iota_amount(self: &TimelockedStakedIota): u64 { self.staked_iota.staked_iota_amount() } + /// Function to get the staked iota amount of a `TimelockedStakedIotaV1`. + public fun staked_iota_amount(self: &TimelockedStakedIotaV1): u64 { self.staked_iota.staked_iota_amount() } - /// Allows calling `.amount()` on `TimelockedStakedIota` to invoke `staked_iota_amount` - public use fun staked_iota_amount as TimelockedStakedIota.amount; + /// Allows calling `.amount()` on `TimelockedStakedIotaV1` to invoke `staked_iota_amount` + public use fun staked_iota_amount as TimelockedStakedIotaV1.amount; - /// Function to get the stake activation epoch of a `TimelockedStakedIota`. - public fun stake_activation_epoch(self: &TimelockedStakedIota): u64 { + /// Function to get the stake activation epoch of a `TimelockedStakedIotaV1`. + public fun stake_activation_epoch(self: &TimelockedStakedIotaV1): u64 { self.staked_iota.stake_activation_epoch() } - /// Function to get the expiration timestamp of a `TimelockedStakedIota`. - public fun expiration_timestamp_ms(self: &TimelockedStakedIota): u64 { + /// Function to get the expiration timestamp of a `TimelockedStakedIotaV1`. + public fun expiration_timestamp_ms(self: &TimelockedStakedIotaV1): u64 { self.expiration_timestamp_ms } - /// Function to get the label of a `TimelockedStakedIota`. - public fun label(self: &TimelockedStakedIota): Option { + /// Function to get the label of a `TimelockedStakedIotaV1`. + public fun label(self: &TimelockedStakedIotaV1): Option { self.label } - /// Check if a `TimelockedStakedIota` is labeled with the type `L`. - public fun is_labeled_with(self: &TimelockedStakedIota): bool { + /// Check if a `TimelockedStakedIotaV1` is labeled with the type `L`. + public fun is_labeled_with(self: &TimelockedStakedIotaV1): bool { if (self.label.is_some()) { self.label.borrow() == timelock::type_name() } @@ -288,9 +288,9 @@ module iota_system::timelocked_staking { // === Internal === - /// A utility function to destroy a `TimelockedStakedIota`. - fun unpack(self: TimelockedStakedIota): (StakedIota, u64, Option) { - let TimelockedStakedIota { + /// A utility function to destroy a `TimelockedStakedIotaV1`. + fun unpack(self: TimelockedStakedIotaV1): (StakedIotaV1, u64, Option) { + let TimelockedStakedIotaV1 { id, staked_iota, expiration_timestamp_ms, @@ -303,13 +303,13 @@ module iota_system::timelocked_staking { } - /// A utility function to transfer a `TimelockedStakedIota` to a receiver. - fun transfer(stake: TimelockedStakedIota, receiver: address) { + /// A utility function to transfer a `TimelockedStakedIotaV1` to a receiver. + fun transfer(stake: TimelockedStakedIotaV1, receiver: address) { transfer::transfer(stake, receiver); } - /// A utility function to transfer a vector of `TimelockedStakedIota` to a receiver. - fun transfer_multiple(mut stakes: vector, receiver: address) { + /// A utility function to transfer a vector of `TimelockedStakedIotaV1` to a receiver. + fun transfer_multiple(mut stakes: vector, receiver: address) { // Transfer all the time-locked stakes to the recipient. while (!stakes.is_empty()) { let stake = stakes.pop_back(); @@ -324,7 +324,7 @@ module iota_system::timelocked_staking { /// Request to add timelocked stake to the validator's staking pool at genesis public(package) fun request_add_stake_at_genesis( - validator: &mut Validator, + validator: &mut ValidatorV1, stake: Balance, staker_address: address, expiration_timestamp_ms: u64, @@ -332,7 +332,7 @@ module iota_system::timelocked_staking { ctx: &mut TxContext, ) { let staked_iota = validator.request_add_stake_at_genesis_with_receipt(stake, ctx); - let timelocked_staked_iota = TimelockedStakedIota { + let timelocked_staked_iota = TimelockedStakedIotaV1 { id: object::new(ctx), staked_iota, expiration_timestamp_ms, diff --git a/crates/iota-framework/packages/iota-system/sources/validator.move b/crates/iota-framework/packages/iota-system/sources/validator.move index f2c20c5800f..a1f2b170ab6 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator.move +++ b/crates/iota-framework/packages/iota-system/sources/validator.move @@ -9,7 +9,7 @@ module iota_system::validator { use iota::balance::Balance; use iota::iota::IOTA; use iota_system::validator_cap::{Self, ValidatorOperationCap}; - use iota_system::staking_pool::{Self, PoolTokenExchangeRate, StakedIota, StakingPool}; + use iota_system::staking_pool::{Self, PoolTokenExchangeRateV1, StakedIotaV1, StakingPoolV1}; use std::string::String; use iota::url::Url; use iota::url; @@ -74,8 +74,8 @@ module iota_system::validator { /// Max gas price a validator can set is 100K NANOS. const MAX_VALIDATOR_GAS_PRICE: u64 = 100_000; - public struct ValidatorMetadata has store { - /// The Iota Address of the validator. This is the sender that created the Validator object, + public struct ValidatorMetadataV1 has store { + /// The Iota Address of the validator. This is the sender that created the ValidatorV1 object, /// and also the address to send validator/coins to during withdraws. iota_address: address, /// The public key bytes corresponding to the private key that the validator @@ -117,9 +117,9 @@ module iota_system::validator { extra_fields: Bag, } - public struct Validator has store { + public struct ValidatorV1 has store { /// Summary of the validator. - metadata: ValidatorMetadata, + metadata: ValidatorMetadataV1, /// The voting power of this validator, which might be different from its /// stake amount. voting_power: u64, @@ -128,7 +128,7 @@ module iota_system::validator { /// Gas price quote, updated only at end of epoch. gas_price: u64, /// Staking pool for this validator. - staking_pool: StakingPool, + staking_pool: StakingPoolV1, /// Commission rate of the validator, in basis point. commission_rate: u64, /// Total amount of stake that would be active in the next epoch. @@ -176,8 +176,8 @@ module iota_system::validator { primary_address: String, worker_address: String, extra_fields: Bag, - ): ValidatorMetadata { - let metadata = ValidatorMetadata { + ): ValidatorMetadataV1 { + let metadata = ValidatorMetadataV1 { iota_address, protocol_pubkey_bytes, network_pubkey_bytes, @@ -221,7 +221,7 @@ module iota_system::validator { gas_price: u64, commission_rate: u64, ctx: &mut TxContext - ): Validator { + ): ValidatorV1 { assert!( net_address.length() <= MAX_VALIDATOR_METADATA_LENGTH && p2p_address.length() <= MAX_VALIDATOR_METADATA_LENGTH @@ -265,27 +265,27 @@ module iota_system::validator { } /// Deactivate this validator's staking pool - public(package) fun deactivate(self: &mut Validator, deactivation_epoch: u64) { + public(package) fun deactivate(self: &mut ValidatorV1, deactivation_epoch: u64) { self.staking_pool.deactivate_staking_pool(deactivation_epoch) } - public(package) fun activate(self: &mut Validator, activation_epoch: u64) { + public(package) fun activate(self: &mut ValidatorV1, activation_epoch: u64) { self.staking_pool.activate_staking_pool(activation_epoch); } /// Process pending stake and pending withdraws, and update the gas price. - public(package) fun adjust_stake_and_gas_price(self: &mut Validator) { + public(package) fun adjust_stake_and_gas_price(self: &mut ValidatorV1) { self.gas_price = self.next_epoch_gas_price; self.commission_rate = self.next_epoch_commission_rate; } /// Request to add stake to the validator's staking pool, processed at the end of the epoch. public(package) fun request_add_stake( - self: &mut Validator, + self: &mut ValidatorV1, stake: Balance, staker_address: address, ctx: &mut TxContext, - ) : StakedIota { + ) : StakedIotaV1 { let stake_amount = stake.value(); assert!(stake_amount > 0, EInvalidStakeAmount); let stake_epoch = ctx.epoch() + 1; @@ -309,7 +309,7 @@ module iota_system::validator { /// Request to add stake to the validator's staking pool at genesis public(package) fun request_add_stake_at_genesis( - self: &mut Validator, + self: &mut ValidatorV1, stake: Balance, staker_address: address, ctx: &mut TxContext, @@ -323,12 +323,12 @@ module iota_system::validator { } /// Internal request to add stake to the validator's staking pool at genesis. - /// Returns a StakedIota + /// Returns a StakedIotaV1 public(package) fun request_add_stake_at_genesis_with_receipt( - self: &mut Validator, + self: &mut ValidatorV1, stake: Balance, ctx: &mut TxContext, - ) : StakedIota { + ) : StakedIotaV1 { assert!(ctx.epoch() == 0, ECalledDuringNonGenesis); let stake_amount = stake.value(); assert!(stake_amount > 0, EInvalidStakeAmount); @@ -348,8 +348,8 @@ module iota_system::validator { /// Request to withdraw stake from the validator's staking pool, processed at the end of the epoch. public(package) fun request_withdraw_stake( - self: &mut Validator, - staked_iota: StakedIota, + self: &mut ValidatorV1, + staked_iota: StakedIotaV1, ctx: &TxContext, ) : Balance { let principal_amount = staked_iota.staked_iota_amount(); @@ -375,7 +375,7 @@ module iota_system::validator { /// Request to set new gas price for the next epoch. /// Need to present a `ValidatorOperationCap`. public(package) fun request_set_gas_price( - self: &mut Validator, + self: &mut ValidatorV1, verified_cap: ValidatorOperationCap, new_price: u64, ) { @@ -387,7 +387,7 @@ module iota_system::validator { /// Set new gas price for the candidate validator. public(package) fun set_candidate_gas_price( - self: &mut Validator, + self: &mut ValidatorV1, verified_cap: ValidatorOperationCap, new_price: u64 ) { @@ -400,182 +400,182 @@ module iota_system::validator { } /// Request to set new commission rate for the next epoch. - public(package) fun request_set_commission_rate(self: &mut Validator, new_commission_rate: u64) { + public(package) fun request_set_commission_rate(self: &mut ValidatorV1, new_commission_rate: u64) { assert!(new_commission_rate <= MAX_COMMISSION_RATE, ECommissionRateTooHigh); self.next_epoch_commission_rate = new_commission_rate; } /// Set new commission rate for the candidate validator. - public(package) fun set_candidate_commission_rate(self: &mut Validator, new_commission_rate: u64) { + public(package) fun set_candidate_commission_rate(self: &mut ValidatorV1, new_commission_rate: u64) { assert!(is_preactive(self), ENotValidatorCandidate); assert!(new_commission_rate <= MAX_COMMISSION_RATE, ECommissionRateTooHigh); self.commission_rate = new_commission_rate; } /// Deposit stakes rewards into the validator's staking pool, called at the end of the epoch. - public(package) fun deposit_stake_rewards(self: &mut Validator, reward: Balance) { + public(package) fun deposit_stake_rewards(self: &mut ValidatorV1, reward: Balance) { self.next_epoch_stake = self.next_epoch_stake + reward.value(); self.staking_pool.deposit_rewards(reward); } /// Process pending stakes and withdraws, called at the end of the epoch. - public(package) fun process_pending_stakes_and_withdraws(self: &mut Validator, ctx: &TxContext) { + public(package) fun process_pending_stakes_and_withdraws(self: &mut ValidatorV1, ctx: &TxContext) { self.staking_pool.process_pending_stakes_and_withdraws(ctx); assert!(stake_amount(self) == self.next_epoch_stake, EInvalidStakeAmount); } /// Returns true if the validator is preactive. - public fun is_preactive(self: &Validator): bool { + public fun is_preactive(self: &ValidatorV1): bool { self.staking_pool.is_preactive() } - public fun metadata(self: &Validator): &ValidatorMetadata { + public fun metadata(self: &ValidatorV1): &ValidatorMetadataV1 { &self.metadata } - public fun iota_address(self: &Validator): address { + public fun iota_address(self: &ValidatorV1): address { self.metadata.iota_address } - public fun name(self: &Validator): &String { + public fun name(self: &ValidatorV1): &String { &self.metadata.name } - public fun description(self: &Validator): &String { + public fun description(self: &ValidatorV1): &String { &self.metadata.description } - public fun image_url(self: &Validator): &Url { + public fun image_url(self: &ValidatorV1): &Url { &self.metadata.image_url } - public fun project_url(self: &Validator): &Url { + public fun project_url(self: &ValidatorV1): &Url { &self.metadata.project_url } - public fun network_address(self: &Validator): &String { + public fun network_address(self: &ValidatorV1): &String { &self.metadata.net_address } - public fun p2p_address(self: &Validator): &String { + public fun p2p_address(self: &ValidatorV1): &String { &self.metadata.p2p_address } - public fun primary_address(self: &Validator): &String { + public fun primary_address(self: &ValidatorV1): &String { &self.metadata.primary_address } - public fun worker_address(self: &Validator): &String { + public fun worker_address(self: &ValidatorV1): &String { &self.metadata.worker_address } - public fun protocol_pubkey_bytes(self: &Validator): &vector { + public fun protocol_pubkey_bytes(self: &ValidatorV1): &vector { &self.metadata.protocol_pubkey_bytes } - public fun proof_of_possession(self: &Validator): &vector { + public fun proof_of_possession(self: &ValidatorV1): &vector { &self.metadata.proof_of_possession } - public fun network_pubkey_bytes(self: &Validator): &vector { + public fun network_pubkey_bytes(self: &ValidatorV1): &vector { &self.metadata.network_pubkey_bytes } - public fun worker_pubkey_bytes(self: &Validator): &vector { + public fun worker_pubkey_bytes(self: &ValidatorV1): &vector { &self.metadata.worker_pubkey_bytes } - public fun next_epoch_network_address(self: &Validator): &Option { + public fun next_epoch_network_address(self: &ValidatorV1): &Option { &self.metadata.next_epoch_net_address } - public fun next_epoch_p2p_address(self: &Validator): &Option { + public fun next_epoch_p2p_address(self: &ValidatorV1): &Option { &self.metadata.next_epoch_p2p_address } - public fun next_epoch_primary_address(self: &Validator): &Option { + public fun next_epoch_primary_address(self: &ValidatorV1): &Option { &self.metadata.next_epoch_primary_address } - public fun next_epoch_worker_address(self: &Validator): &Option { + public fun next_epoch_worker_address(self: &ValidatorV1): &Option { &self.metadata.next_epoch_worker_address } - public fun next_epoch_protocol_pubkey_bytes(self: &Validator): &Option> { + public fun next_epoch_protocol_pubkey_bytes(self: &ValidatorV1): &Option> { &self.metadata.next_epoch_protocol_pubkey_bytes } - public fun next_epoch_proof_of_possession(self: &Validator): &Option> { + public fun next_epoch_proof_of_possession(self: &ValidatorV1): &Option> { &self.metadata.next_epoch_proof_of_possession } - public fun next_epoch_network_pubkey_bytes(self: &Validator): &Option> { + public fun next_epoch_network_pubkey_bytes(self: &ValidatorV1): &Option> { &self.metadata.next_epoch_network_pubkey_bytes } - public fun next_epoch_worker_pubkey_bytes(self: &Validator): &Option> { + public fun next_epoch_worker_pubkey_bytes(self: &ValidatorV1): &Option> { &self.metadata.next_epoch_worker_pubkey_bytes } - public fun operation_cap_id(self: &Validator): &ID { + public fun operation_cap_id(self: &ValidatorV1): &ID { &self.operation_cap_id } - public fun next_epoch_gas_price(self: &Validator): u64 { + public fun next_epoch_gas_price(self: &ValidatorV1): u64 { self.next_epoch_gas_price } // TODO: this and `delegate_amount` and `total_stake` all seem to return the same value? // two of the functions can probably be removed. - public fun total_stake_amount(self: &Validator): u64 { + public fun total_stake_amount(self: &ValidatorV1): u64 { self.staking_pool.iota_balance() } - public fun stake_amount(self: &Validator): u64 { + public fun stake_amount(self: &ValidatorV1): u64 { self.staking_pool.iota_balance() } /// Return the total amount staked with this validator - public fun total_stake(self: &Validator): u64 { + public fun total_stake(self: &ValidatorV1): u64 { stake_amount(self) } /// Return the voting power of this validator. - public fun voting_power(self: &Validator): u64 { + public fun voting_power(self: &ValidatorV1): u64 { self.voting_power } /// Set the voting power of this validator, called only from validator_set. - public(package) fun set_voting_power(self: &mut Validator, new_voting_power: u64) { + public(package) fun set_voting_power(self: &mut ValidatorV1, new_voting_power: u64) { self.voting_power = new_voting_power; } - public fun pending_stake_amount(self: &Validator): u64 { + public fun pending_stake_amount(self: &ValidatorV1): u64 { self.staking_pool.pending_stake_amount() } - public fun pending_stake_withdraw_amount(self: &Validator): u64 { + public fun pending_stake_withdraw_amount(self: &ValidatorV1): u64 { self.staking_pool.pending_stake_withdraw_amount() } - public fun gas_price(self: &Validator): u64 { + public fun gas_price(self: &ValidatorV1): u64 { self.gas_price } - public fun commission_rate(self: &Validator): u64 { + public fun commission_rate(self: &ValidatorV1): u64 { self.commission_rate } - public fun pool_token_exchange_rate_at_epoch(self: &Validator, epoch: u64): PoolTokenExchangeRate { + public fun pool_token_exchange_rate_at_epoch(self: &ValidatorV1, epoch: u64): PoolTokenExchangeRateV1 { self.staking_pool.pool_token_exchange_rate_at_epoch(epoch) } - public fun staking_pool_id(self: &Validator): ID { + public fun staking_pool_id(self: &ValidatorV1): ID { object::id(&self.staking_pool) } // MUSTFIX: We need to check this when updating metadata as well. - public fun is_duplicate(self: &Validator, other: &Validator): bool { + public fun is_duplicate(self: &ValidatorV1, other: &ValidatorV1): bool { self.metadata.iota_address == other.metadata.iota_address || self.metadata.name == other.metadata.name || self.metadata.net_address == other.metadata.net_address @@ -631,7 +631,7 @@ module iota_system::validator { /// Create a new `UnverifiedValidatorOperationCap`, transfer to the validator, /// and registers it, thus revoking the previous cap's permission. - public(package) fun new_unverified_validator_operation_cap_and_transfer(self: &mut Validator, ctx: &mut TxContext) { + public(package) fun new_unverified_validator_operation_cap_and_transfer(self: &mut ValidatorV1, ctx: &mut TxContext) { let address = ctx.sender(); assert!(address == self.metadata.iota_address, ENewCapNotCreatedByValidatorItself); let new_id = validator_cap::new_unverified_validator_operation_cap_and_transfer(address, ctx); @@ -639,7 +639,7 @@ module iota_system::validator { } /// Update name of the validator. - public(package) fun update_name(self: &mut Validator, name: vector) { + public(package) fun update_name(self: &mut ValidatorV1, name: vector) { assert!( name.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -648,7 +648,7 @@ module iota_system::validator { } /// Update description of the validator. - public(package) fun update_description(self: &mut Validator, description: vector) { + public(package) fun update_description(self: &mut ValidatorV1, description: vector) { assert!( description.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -657,7 +657,7 @@ module iota_system::validator { } /// Update image url of the validator. - public(package) fun update_image_url(self: &mut Validator, image_url: vector) { + public(package) fun update_image_url(self: &mut ValidatorV1, image_url: vector) { assert!( image_url.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -666,7 +666,7 @@ module iota_system::validator { } /// Update project url of the validator. - public(package) fun update_project_url(self: &mut Validator, project_url: vector) { + public(package) fun update_project_url(self: &mut ValidatorV1, project_url: vector) { assert!( project_url.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -675,7 +675,7 @@ module iota_system::validator { } /// Update network address of this validator, taking effects from next epoch - public(package) fun update_next_epoch_network_address(self: &mut Validator, net_address: vector) { + public(package) fun update_next_epoch_network_address(self: &mut ValidatorV1, net_address: vector) { assert!( net_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -686,7 +686,7 @@ module iota_system::validator { } /// Update network address of this candidate validator - public(package) fun update_candidate_network_address(self: &mut Validator, net_address: vector) { + public(package) fun update_candidate_network_address(self: &mut ValidatorV1, net_address: vector) { assert!(is_preactive(self), ENotValidatorCandidate); assert!( net_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, @@ -698,7 +698,7 @@ module iota_system::validator { } /// Update p2p address of this validator, taking effects from next epoch - public(package) fun update_next_epoch_p2p_address(self: &mut Validator, p2p_address: vector) { + public(package) fun update_next_epoch_p2p_address(self: &mut ValidatorV1, p2p_address: vector) { assert!( p2p_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -709,7 +709,7 @@ module iota_system::validator { } /// Update p2p address of this candidate validator - public(package) fun update_candidate_p2p_address(self: &mut Validator, p2p_address: vector) { + public(package) fun update_candidate_p2p_address(self: &mut ValidatorV1, p2p_address: vector) { assert!(is_preactive(self), ENotValidatorCandidate); assert!( p2p_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, @@ -721,7 +721,7 @@ module iota_system::validator { } /// Update primary address of this validator, taking effects from next epoch - public(package) fun update_next_epoch_primary_address(self: &mut Validator, primary_address: vector) { + public(package) fun update_next_epoch_primary_address(self: &mut ValidatorV1, primary_address: vector) { assert!( primary_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -732,7 +732,7 @@ module iota_system::validator { } /// Update primary address of this candidate validator - public(package) fun update_candidate_primary_address(self: &mut Validator, primary_address: vector) { + public(package) fun update_candidate_primary_address(self: &mut ValidatorV1, primary_address: vector) { assert!(is_preactive(self), ENotValidatorCandidate); assert!( primary_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, @@ -744,7 +744,7 @@ module iota_system::validator { } /// Update worker address of this validator, taking effects from next epoch - public(package) fun update_next_epoch_worker_address(self: &mut Validator, worker_address: vector) { + public(package) fun update_next_epoch_worker_address(self: &mut ValidatorV1, worker_address: vector) { assert!( worker_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, EValidatorMetadataExceedingLengthLimit @@ -755,7 +755,7 @@ module iota_system::validator { } /// Update worker address of this candidate validator - public(package) fun update_candidate_worker_address(self: &mut Validator, worker_address: vector) { + public(package) fun update_candidate_worker_address(self: &mut ValidatorV1, worker_address: vector) { assert!(is_preactive(self), ENotValidatorCandidate); assert!( worker_address.length() <= MAX_VALIDATOR_METADATA_LENGTH, @@ -767,14 +767,14 @@ module iota_system::validator { } /// Update protocol public key of this validator, taking effects from next epoch - public(package) fun update_next_epoch_protocol_pubkey(self: &mut Validator, protocol_pubkey: vector, proof_of_possession: vector) { + public(package) fun update_next_epoch_protocol_pubkey(self: &mut ValidatorV1, protocol_pubkey: vector, proof_of_possession: vector) { self.metadata.next_epoch_protocol_pubkey_bytes = option::some(protocol_pubkey); self.metadata.next_epoch_proof_of_possession = option::some(proof_of_possession); validate_metadata(&self.metadata); } /// Update protocol public key of this candidate validator - public(package) fun update_candidate_protocol_pubkey(self: &mut Validator, protocol_pubkey: vector, proof_of_possession: vector) { + public(package) fun update_candidate_protocol_pubkey(self: &mut ValidatorV1, protocol_pubkey: vector, proof_of_possession: vector) { assert!(is_preactive(self), ENotValidatorCandidate); self.metadata.protocol_pubkey_bytes = protocol_pubkey; self.metadata.proof_of_possession = proof_of_possession; @@ -782,26 +782,26 @@ module iota_system::validator { } /// Update network public key of this validator, taking effects from next epoch - public(package) fun update_next_epoch_network_pubkey(self: &mut Validator, network_pubkey: vector) { + public(package) fun update_next_epoch_network_pubkey(self: &mut ValidatorV1, network_pubkey: vector) { self.metadata.next_epoch_network_pubkey_bytes = option::some(network_pubkey); validate_metadata(&self.metadata); } /// Update network public key of this candidate validator - public(package) fun update_candidate_network_pubkey(self: &mut Validator, network_pubkey: vector) { + public(package) fun update_candidate_network_pubkey(self: &mut ValidatorV1, network_pubkey: vector) { assert!(is_preactive(self), ENotValidatorCandidate); self.metadata.network_pubkey_bytes = network_pubkey; validate_metadata(&self.metadata); } /// Update Narwhal worker public key of this validator, taking effects from next epoch - public(package) fun update_next_epoch_worker_pubkey(self: &mut Validator, worker_pubkey: vector) { + public(package) fun update_next_epoch_worker_pubkey(self: &mut ValidatorV1, worker_pubkey: vector) { self.metadata.next_epoch_worker_pubkey_bytes = option::some(worker_pubkey); validate_metadata(&self.metadata); } /// Update Narwhal worker public key of this candidate validator - public(package) fun update_candidate_worker_pubkey(self: &mut Validator, worker_pubkey: vector) { + public(package) fun update_candidate_worker_pubkey(self: &mut ValidatorV1, worker_pubkey: vector) { assert!(is_preactive(self), ENotValidatorCandidate); self.metadata.worker_pubkey_bytes = worker_pubkey; validate_metadata(&self.metadata); @@ -810,7 +810,7 @@ module iota_system::validator { /// Effectutate all staged next epoch metadata for this validator. /// NOTE: this function SHOULD ONLY be called by validator_set when /// advancing an epoch. - public(package) fun effectuate_staged_metadata(self: &mut Validator) { + public(package) fun effectuate_staged_metadata(self: &mut ValidatorV1) { if (next_epoch_network_address(self).is_some()) { self.metadata.net_address = self.metadata.next_epoch_net_address.extract(); self.metadata.next_epoch_net_address = option::none(); @@ -850,30 +850,30 @@ module iota_system::validator { } /// Aborts if validator metadata is valid - public fun validate_metadata(metadata: &ValidatorMetadata) { + public fun validate_metadata(metadata: &ValidatorMetadataV1) { validate_metadata_bcs(bcs::to_bytes(metadata)); } public native fun validate_metadata_bcs(metadata: vector); - public(package) fun get_staking_pool_ref(self: &Validator) : &StakingPool { + public(package) fun get_staking_pool_ref(self: &ValidatorV1) : &StakingPoolV1 { &self.staking_pool } - /// Create a new validator from the given `ValidatorMetadata`, called by both `new` and `new_for_testing`. + /// Create a new validator from the given `ValidatorMetadataV1`, called by both `new` and `new_for_testing`. fun new_from_metadata( - metadata: ValidatorMetadata, + metadata: ValidatorMetadataV1, gas_price: u64, commission_rate: u64, ctx: &mut TxContext - ): Validator { + ): ValidatorV1 { let iota_address = metadata.iota_address; let staking_pool = staking_pool::new(ctx); let operation_cap_id = validator_cap::new_unverified_validator_operation_cap_and_transfer(iota_address, ctx); - Validator { + ValidatorV1 { metadata, // Initialize the voting power to be 0. // At the epoch change where this validator is actually added to the @@ -915,7 +915,7 @@ module iota_system::validator { commission_rate: u64, is_active_at_genesis: bool, ctx: &mut TxContext - ): Validator { + ): ValidatorV1 { let mut validator = new_from_metadata( new_metadata( iota_address, diff --git a/crates/iota-framework/packages/iota-system/sources/validator_set.move b/crates/iota-framework/packages/iota-system/sources/validator_set.move index 649ea8b5cb0..522a3e33e6d 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator_set.move +++ b/crates/iota-framework/packages/iota-system/sources/validator_set.move @@ -6,9 +6,9 @@ module iota_system::validator_set { use iota::balance::Balance; use iota::iota::IOTA; - use iota_system::validator::{Validator, staking_pool_id, iota_address}; + use iota_system::validator::{ValidatorV1, staking_pool_id, iota_address}; use iota_system::validator_cap::{Self, UnverifiedValidatorOperationCap, ValidatorOperationCap}; - use iota_system::staking_pool::{PoolTokenExchangeRate, StakedIota, pool_id}; + use iota_system::staking_pool::{PoolTokenExchangeRateV1, StakedIotaV1, pool_id}; use iota::priority_queue as pq; use iota::vec_map::{Self, VecMap}; use iota::vec_set::VecSet; @@ -21,16 +21,16 @@ module iota_system::validator_set { use iota::bag::Bag; use iota::bag; - public struct ValidatorSet has store { + public struct ValidatorSetV1 has store { /// Total amount of stake from all active validators at the beginning of the epoch. total_stake: u64, /// The current list of active validators. - active_validators: vector, + active_validators: vector, /// List of new validator candidates added during the current epoch. /// They will be processed at the end of the epoch. - pending_active_validators: TableVec, + pending_active_validators: TableVec, /// Removal requests from the validators. Each element is an index /// pointing to `active_validators`. @@ -44,7 +44,7 @@ module iota_system::validator_set { /// is added to this table so that stakers can continue to withdraw their stake from it. inactive_validators: Table, - /// Table storing preactive/candidate validators, mapping their addresses to their `Validator ` structs. + /// Table storing preactive/candidate validators, mapping their addresses to their `ValidatorV1 ` structs. /// When an address calls `request_add_validator_candidate`, they get added to this table and become a preactive /// validator. /// When the candidate has met the min stake requirement, they can call `request_add_validator` to @@ -61,20 +61,7 @@ module iota_system::validator_set { #[allow(unused_field)] /// Event containing staking and rewards related information of /// each validator, emitted during epoch advancement. - public struct ValidatorEpochInfoEvent has copy, drop { - epoch: u64, - validator_address: address, - reference_gas_survey_quote: u64, - stake: u64, - commission_rate: u64, - pool_staking_reward: u64, - pool_token_exchange_rate: PoolTokenExchangeRate, - tallying_rule_reporters: vector
, - tallying_rule_global_score: u64, - } - - /// V2 of ValidatorEpochInfoEvent containing more information about the validator. - public struct ValidatorEpochInfoEventV2 has copy, drop { + public struct ValidatorEpochInfoEventV1 has copy, drop { epoch: u64, validator_address: address, reference_gas_survey_quote: u64, @@ -82,7 +69,7 @@ module iota_system::validator_set { voting_power: u64, commission_rate: u64, pool_staking_reward: u64, - pool_token_exchange_rate: PoolTokenExchangeRate, + pool_token_exchange_rate: PoolTokenExchangeRateV1, tallying_rule_reporters: vector
, tallying_rule_global_score: u64, } @@ -134,7 +121,7 @@ module iota_system::validator_set { // ==== initialization at genesis ==== - public(package) fun new(init_active_validators: vector, ctx: &mut TxContext): ValidatorSet { + public(package) fun new(init_active_validators: vector, ctx: &mut TxContext): ValidatorSetV1 { let total_stake = calculate_total_stakes(&init_active_validators); let mut staking_pool_mappings = table::new(ctx); let num_validators = init_active_validators.length(); @@ -144,7 +131,7 @@ module iota_system::validator_set { staking_pool_mappings.add(staking_pool_id(validator), iota_address(validator)); i = i + 1; }; - let mut validators = ValidatorSet { + let mut validators = ValidatorSetV1 { total_stake, active_validators: init_active_validators, pending_active_validators: table_vec::empty(ctx), @@ -164,8 +151,8 @@ module iota_system::validator_set { /// Called by `iota_system` to add a new validator candidate. public(package) fun request_add_validator_candidate( - self: &mut ValidatorSet, - validator: Validator, + self: &mut ValidatorSetV1, + validator: ValidatorV1, ctx: &mut TxContext, ) { // The next assertions are not critical for the protocol, but they are here to catch problematic configs earlier. @@ -191,7 +178,7 @@ module iota_system::validator_set { } /// Called by `iota_system` to remove a validator candidate, and move them to `inactive_validators`. - public(package) fun request_remove_validator_candidate(self: &mut ValidatorSet, ctx: &mut TxContext) { + public(package) fun request_remove_validator_candidate(self: &mut ValidatorSetV1, ctx: &mut TxContext) { let validator_address = ctx.sender(); assert!( self.validator_candidates.contains(validator_address), @@ -218,7 +205,7 @@ module iota_system::validator_set { /// Called by `iota_system` to add a new validator to `pending_active_validators`, which will be /// processed at the end of epoch. - public(package) fun request_add_validator(self: &mut ValidatorSet, min_joining_stake_amount: u64, ctx: &TxContext) { + public(package) fun request_add_validator(self: &mut ValidatorSetV1, min_joining_stake_amount: u64, ctx: &TxContext) { let validator_address = ctx.sender(); assert!( self.validator_candidates.contains(validator_address), @@ -237,7 +224,7 @@ module iota_system::validator_set { self.pending_active_validators.push_back(validator); } - public(package) fun assert_no_pending_or_active_duplicates(self: &ValidatorSet, validator: &Validator) { + public(package) fun assert_no_pending_or_active_duplicates(self: &ValidatorSetV1, validator: &ValidatorV1) { // Validator here must be active or pending, and thus must be identified as duplicate exactly once. assert!( count_duplicates_vec(&self.active_validators, validator) + @@ -251,7 +238,7 @@ module iota_system::validator_set { /// will be processed at the end of epoch. /// Only an active validator can request to be removed. public(package) fun request_remove_validator( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, ctx: &TxContext, ) { let validator_address = ctx.sender(); @@ -273,11 +260,11 @@ module iota_system::validator_set { /// of the epoch. /// Aborts in case the staking amount is smaller than MIN_STAKING_THRESHOLD public(package) fun request_add_stake( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, validator_address: address, stake: Balance, ctx: &mut TxContext, - ) : StakedIota { + ) : StakedIotaV1 { let iota_amount = stake.value(); assert!(iota_amount >= MIN_STAKING_THRESHOLD, EStakingBelowThreshold); let validator = get_candidate_or_active_validator_mut(self, validator_address); @@ -291,8 +278,8 @@ module iota_system::validator_set { /// 2. If the `staked_iota` was staked with a validator that is no longer active, /// the stake and any rewards corresponding to it will be immediately processed. public(package) fun request_withdraw_stake( - self: &mut ValidatorSet, - staked_iota: StakedIota, + self: &mut ValidatorSetV1, + staked_iota: StakedIotaV1, ctx: &TxContext, ) : Balance { let staking_pool_id = pool_id(&staked_iota); @@ -311,7 +298,7 @@ module iota_system::validator_set { // ==== validator config setting functions ==== public(package) fun request_set_commission_rate( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, new_commission_rate: u64, ctx: &TxContext, ) { @@ -331,7 +318,7 @@ module iota_system::validator_set { /// 4. Process pending validator application and withdraws. /// 5. At the end, we calculate the total stake for the new epoch. public(package) fun advance_epoch( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, total_validator_rewards: &mut Balance, validator_report_records: &mut VecMap>, reward_slashing_rate: u64, @@ -420,7 +407,7 @@ module iota_system::validator_set { } fun update_and_process_low_stake_departures( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, low_stake_threshold: u64, very_low_stake_threshold: u64, low_stake_grace_period: u64, @@ -466,7 +453,7 @@ module iota_system::validator_set { /// Effectutate pending next epoch metadata if they are staged. fun effectuate_staged_metadata( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, ) { let num_validators = self.active_validators.length(); let mut i = 0; @@ -481,7 +468,7 @@ module iota_system::validator_set { /// Derive the reference gas price based on the gas price quote submitted by each validator. /// The returned gas price should be greater than or equal to 2/3 of the validators submitted /// gas price, weighted by stake. - public fun derive_reference_gas_price(self: &ValidatorSet): u64 { + public fun derive_reference_gas_price(self: &ValidatorSetV1): u64 { let vs = &self.active_validators; let num_validators = vs.length(); let mut entries = vector[]; @@ -508,37 +495,37 @@ module iota_system::validator_set { // ==== getter functions ==== - public fun total_stake(self: &ValidatorSet): u64 { + public fun total_stake(self: &ValidatorSetV1): u64 { self.total_stake } - public fun validator_total_stake_amount(self: &ValidatorSet, validator_address: address): u64 { + public fun validator_total_stake_amount(self: &ValidatorSetV1, validator_address: address): u64 { let validator = get_validator_ref(&self.active_validators, validator_address); validator.total_stake_amount() } - public fun validator_stake_amount(self: &ValidatorSet, validator_address: address): u64 { + public fun validator_stake_amount(self: &ValidatorSetV1, validator_address: address): u64 { let validator = get_validator_ref(&self.active_validators, validator_address); validator.stake_amount() } - public fun validator_voting_power(self: &ValidatorSet, validator_address: address): u64 { + public fun validator_voting_power(self: &ValidatorSetV1, validator_address: address): u64 { let validator = get_validator_ref(&self.active_validators, validator_address); validator.voting_power() } - public fun validator_staking_pool_id(self: &ValidatorSet, validator_address: address): ID { + public fun validator_staking_pool_id(self: &ValidatorSetV1, validator_address: address): ID { let validator = get_validator_ref(&self.active_validators, validator_address); validator.staking_pool_id() } - public fun staking_pool_mappings(self: &ValidatorSet): &Table { + public fun staking_pool_mappings(self: &ValidatorSetV1): &Table { &self.staking_pool_mappings } public(package) fun pool_exchange_rates( - self: &mut ValidatorSet, pool_id: &ID - ) : &Table { + self: &mut ValidatorSetV1, pool_id: &ID + ) : &Table { let validator = // If the pool id is recorded in the mapping, then it must be either candidate or active. if (self.staking_pool_mappings.contains(*pool_id)) { @@ -552,13 +539,13 @@ module iota_system::validator_set { } /// Get the total number of validators in the next epoch. - public(package) fun next_epoch_validator_count(self: &ValidatorSet): u64 { + public(package) fun next_epoch_validator_count(self: &ValidatorSetV1): u64 { self.active_validators.length() - self.pending_removals.length() + self.pending_active_validators.length() } /// Returns true iff the address exists in active validators. public(package) fun is_active_validator_by_iota_address( - self: &ValidatorSet, + self: &ValidatorSetV1, validator_address: address, ): bool { find_validator(&self.active_validators, validator_address).is_some() @@ -569,15 +556,15 @@ module iota_system::validator_set { /// Checks whether `new_validator` is duplicate with any currently active validators. /// It differs from `is_active_validator_by_iota_address` in that the former checks /// only the iota address but this function looks at more metadata. - fun is_duplicate_with_active_validator(self: &ValidatorSet, new_validator: &Validator): bool { + fun is_duplicate_with_active_validator(self: &ValidatorSetV1, new_validator: &ValidatorV1): bool { is_duplicate_validator(&self.active_validators, new_validator) } - public(package) fun is_duplicate_validator(validators: &vector, new_validator: &Validator): bool { + public(package) fun is_duplicate_validator(validators: &vector, new_validator: &ValidatorV1): bool { count_duplicates_vec(validators, new_validator) > 0 } - fun count_duplicates_vec(validators: &vector, validator: &Validator): u64 { + fun count_duplicates_vec(validators: &vector, validator: &ValidatorV1): u64 { let len = validators.length(); let mut i = 0; let mut result = 0; @@ -592,11 +579,11 @@ module iota_system::validator_set { } /// Checks whether `new_validator` is duplicate with any currently pending validators. - fun is_duplicate_with_pending_validator(self: &ValidatorSet, new_validator: &Validator): bool { + fun is_duplicate_with_pending_validator(self: &ValidatorSetV1, new_validator: &ValidatorV1): bool { count_duplicates_tablevec(&self.pending_active_validators, new_validator) > 0 } - fun count_duplicates_tablevec(validators: &TableVec, validator: &Validator): u64 { + fun count_duplicates_tablevec(validators: &TableVec, validator: &ValidatorV1): u64 { let len = validators.length(); let mut i = 0; let mut result = 0; @@ -611,7 +598,7 @@ module iota_system::validator_set { } /// Get mutable reference to either a candidate or an active validator by address. - fun get_candidate_or_active_validator_mut(self: &mut ValidatorSet, validator_address: address): &mut Validator { + fun get_candidate_or_active_validator_mut(self: &mut ValidatorSetV1, validator_address: address): &mut ValidatorV1 { if (self.validator_candidates.contains(validator_address)) { let wrapper = &mut self.validator_candidates[validator_address]; return wrapper.load_validator_maybe_upgrade() @@ -622,7 +609,7 @@ module iota_system::validator_set { /// Find validator by `validator_address`, in `validators`. /// Returns (true, index) if the validator is found, and the index is its index in the list. /// If not found, returns (false, 0). - fun find_validator(validators: &vector, validator_address: address): Option { + fun find_validator(validators: &vector, validator_address: address): Option { let length = validators.length(); let mut i = 0; while (i < length) { @@ -638,7 +625,7 @@ module iota_system::validator_set { /// Find validator by `validator_address`, in `validators`. /// Returns (true, index) if the validator is found, and the index is its index in the list. /// If not found, returns (false, 0). - fun find_validator_from_table_vec(validators: &TableVec, validator_address: address): Option { + fun find_validator_from_table_vec(validators: &TableVec, validator_address: address): Option { let length = validators.length(); let mut i = 0; while (i < length) { @@ -654,7 +641,7 @@ module iota_system::validator_set { /// Given a vector of validator addresses, return their indices in the validator set. /// Aborts if any address isn't in the given validator set. - fun get_validator_indices(validators: &vector, validator_addresses: &vector
): vector { + fun get_validator_indices(validators: &vector, validator_addresses: &vector
): vector { let length = validator_addresses.length(); let mut i = 0; let mut res = vector[]; @@ -669,9 +656,9 @@ module iota_system::validator_set { } public(package) fun get_validator_mut( - validators: &mut vector, + validators: &mut vector, validator_address: address, - ): &mut Validator { + ): &mut ValidatorV1 { let mut validator_index_opt = find_validator(validators, validator_address); assert!(validator_index_opt.is_some(), ENotAValidator); let validator_index = validator_index_opt.extract(); @@ -681,12 +668,12 @@ module iota_system::validator_set { /// Get mutable reference to an active or (if active does not exist) pending or (if pending and /// active do not exist) or candidate validator by address. /// Note: this function should be called carefully, only after verifying the transaction - /// sender has the ability to modify the `Validator`. + /// sender has the ability to modify the `ValidatorV1`. fun get_active_or_pending_or_candidate_validator_mut( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, validator_address: address, include_candidate: bool, - ): &mut Validator { + ): &mut ValidatorV1 { let mut validator_index_opt = find_validator(&self.active_validators, validator_address); if (validator_index_opt.is_some()) { let validator_index = validator_index_opt.extract(); @@ -704,33 +691,33 @@ module iota_system::validator_set { } public(package) fun get_validator_mut_with_verified_cap( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, verified_cap: &ValidatorOperationCap, include_candidate: bool, - ): &mut Validator { + ): &mut ValidatorV1 { get_active_or_pending_or_candidate_validator_mut(self, *verified_cap.verified_operation_cap_address(), include_candidate) } public(package) fun get_validator_mut_with_ctx( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, ctx: &TxContext, - ): &mut Validator { + ): &mut ValidatorV1 { let validator_address = ctx.sender(); get_active_or_pending_or_candidate_validator_mut(self, validator_address, false) } public(package) fun get_validator_mut_with_ctx_including_candidates( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, ctx: &TxContext, - ): &mut Validator { + ): &mut ValidatorV1 { let validator_address = ctx.sender(); get_active_or_pending_or_candidate_validator_mut(self, validator_address, true) } fun get_validator_ref( - validators: &vector, + validators: &vector, validator_address: address, - ): &Validator { + ): &ValidatorV1 { let mut validator_index_opt = find_validator(validators, validator_address); assert!(validator_index_opt.is_some(), ENotAValidator); let validator_index = validator_index_opt.extract(); @@ -738,10 +725,10 @@ module iota_system::validator_set { } public(package) fun get_active_or_pending_or_candidate_validator_ref( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, validator_address: address, which_validator: u8, - ): &Validator { + ): &ValidatorV1 { let mut validator_index_opt = find_validator(&self.active_validators, validator_address); if (validator_index_opt.is_some() || which_validator == ACTIVE_VALIDATOR_ONLY) { let validator_index = validator_index_opt.extract(); @@ -756,9 +743,9 @@ module iota_system::validator_set { } public fun get_active_validator_ref( - self: &ValidatorSet, + self: &ValidatorSetV1, validator_address: address, - ): &Validator { + ): &ValidatorV1 { let mut validator_index_opt = find_validator(&self.active_validators, validator_address); assert!(validator_index_opt.is_some(), ENotAValidator); let validator_index = validator_index_opt.extract(); @@ -766,9 +753,9 @@ module iota_system::validator_set { } public fun get_pending_validator_ref( - self: &ValidatorSet, + self: &ValidatorSetV1, validator_address: address, - ): &Validator { + ): &ValidatorV1 { let mut validator_index_opt = find_validator_from_table_vec(&self.pending_active_validators, validator_address); assert!(validator_index_opt.is_some(), ENotAPendingValidator); let validator_index = validator_index_opt.extract(); @@ -777,9 +764,9 @@ module iota_system::validator_set { #[test_only] public fun get_candidate_validator_ref( - self: &ValidatorSet, + self: &ValidatorSetV1, validator_address: address, - ): &Validator { + ): &ValidatorV1 { self.validator_candidates[validator_address].get_inner_validator_ref() } @@ -787,7 +774,7 @@ module iota_system::validator_set { /// If `active_validator_only` is true, only verify the Cap for an active validator. /// Otherwise, verify the Cap for au either active or pending validator. public(package) fun verify_cap( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, cap: &UnverifiedValidatorOperationCap, which_validator: u8, ): ValidatorOperationCap { @@ -804,7 +791,7 @@ module iota_system::validator_set { /// Process the pending withdraw requests. For each pending request, the validator /// is removed from `validators` and its staking pool is put into the `inactive_validators` table. fun process_pending_removals( - self: &mut ValidatorSet, + self: &mut ValidatorSetV1, validator_report_records: &mut VecMap>, ctx: &mut TxContext, ) { @@ -817,8 +804,8 @@ module iota_system::validator_set { } fun process_validator_departure( - self: &mut ValidatorSet, - mut validator: Validator, + self: &mut ValidatorSetV1, + mut validator: ValidatorV1, validator_report_records: &mut VecMap>, is_voluntary: bool, ctx: &mut TxContext, @@ -882,7 +869,7 @@ module iota_system::validator_set { /// Process the pending new validators. They are activated and inserted into `validators`. fun process_pending_validators( - self: &mut ValidatorSet, new_epoch: u64, + self: &mut ValidatorSetV1, new_epoch: u64, ) { while (!self.pending_active_validators.is_empty()) { let mut validator = self.pending_active_validators.pop_back(); @@ -919,7 +906,7 @@ module iota_system::validator_set { /// Process all active validators' pending stake deposits and withdraws. fun process_pending_stakes_and_withdraws( - validators: &mut vector, ctx: &TxContext + validators: &mut vector, ctx: &TxContext ) { let length = validators.length(); let mut i = 0; @@ -931,7 +918,7 @@ module iota_system::validator_set { } /// Calculate the total active validator stake. - fun calculate_total_stakes(validators: &vector): u64 { + fun calculate_total_stakes(validators: &vector): u64 { let mut stake = 0; let length = validators.length(); let mut i = 0; @@ -944,7 +931,7 @@ module iota_system::validator_set { } /// Process the pending stake changes for each validator. - fun adjust_stake_and_gas_price(validators: &mut vector) { + fun adjust_stake_and_gas_price(validators: &mut vector) { let length = validators.length(); let mut i = 0; while (i < length) { @@ -986,7 +973,7 @@ module iota_system::validator_set { /// Process the validator report records of the epoch and return the addresses of the /// non-performant validators according to the input threshold. fun compute_slashed_validators( - self: &ValidatorSet, + self: &ValidatorSetV1, mut validator_report_records: VecMap>, ): vector
{ let mut slashed_validators = vector[]; @@ -1011,7 +998,7 @@ module iota_system::validator_set { /// account the tallying rule results. /// Returns the unadjusted amounts of staking reward for each validator. fun compute_unadjusted_reward_distribution( - validators: &vector, + validators: &vector, total_voting_power: u64, total_staking_reward: u64, ): vector { @@ -1035,7 +1022,7 @@ module iota_system::validator_set { /// Returns the staking rewards each validator gets. /// The staking rewards are shared with the stakers. fun compute_adjusted_reward_distribution( - validators: &vector, + validators: &vector, total_voting_power: u64, total_slashed_validator_voting_power: u64, unadjusted_staking_reward_amounts: vector, @@ -1078,7 +1065,7 @@ module iota_system::validator_set { } fun distribute_reward( - validators: &mut vector, + validators: &mut vector, adjusted_staking_reward_amounts: &vector, staking_rewards: &mut Balance, ctx: &mut TxContext @@ -1116,7 +1103,7 @@ module iota_system::validator_set { /// including stakes, rewards, performance, etc. fun emit_validator_epoch_events( new_epoch: u64, - vs: &vector, + vs: &vector, pool_staking_reward_amounts: &vector, report_records: &VecMap>, slashed_validators: &vector
, @@ -1136,7 +1123,7 @@ module iota_system::validator_set { if (slashed_validators.contains(&validator_address)) 0 else 1; event::emit( - ValidatorEpochInfoEventV2 { + ValidatorEpochInfoEventV1 { epoch: new_epoch, validator_address, reference_gas_survey_quote: v.gas_price(), @@ -1154,7 +1141,7 @@ module iota_system::validator_set { } /// Sum up the total stake of a given list of validator addresses. - public fun sum_voting_power_by_addresses(vs: &vector, addresses: &vector
): u64 { + public fun sum_voting_power_by_addresses(vs: &vector, addresses: &vector
): u64 { let mut sum = 0; let mut i = 0; let length = addresses.length(); @@ -1167,21 +1154,21 @@ module iota_system::validator_set { } /// Return the active validators in `self` - public fun active_validators(self: &ValidatorSet): &vector { + public fun active_validators(self: &ValidatorSetV1): &vector { &self.active_validators } /// Returns true if the `addr` is a validator candidate. - public fun is_validator_candidate(self: &ValidatorSet, addr: address): bool { + public fun is_validator_candidate(self: &ValidatorSetV1, addr: address): bool { self.validator_candidates.contains(addr) } /// Returns true if the staking pool identified by `staking_pool_id` is of an inactive validator. - public fun is_inactive_validator(self: &ValidatorSet, staking_pool_id: ID): bool { + public fun is_inactive_validator(self: &ValidatorSetV1, staking_pool_id: ID): bool { self.inactive_validators.contains(staking_pool_id) } - public(package) fun active_validator_addresses(self: &ValidatorSet): vector
{ + public(package) fun active_validator_addresses(self: &ValidatorSetV1): vector
{ let vs = &self.active_validators; let mut res = vector[]; let mut i = 0; diff --git a/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move b/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move index 81e0d53100a..56f63e27b36 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move +++ b/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move @@ -4,7 +4,7 @@ module iota_system::validator_wrapper { use iota::versioned::Versioned; - use iota_system::validator::Validator; + use iota_system::validator::ValidatorV1; use iota::versioned; const EInvalidVersion: u64 = 0; @@ -13,8 +13,8 @@ module iota_system::validator_wrapper { inner: Versioned } - // Validator corresponds to version 1. - public(package) fun create_v1(validator: Validator, ctx: &mut TxContext): ValidatorWrapper { + // ValidatorV1 corresponds to version 1. + public(package) fun create_v1(validator: ValidatorV1, ctx: &mut TxContext): ValidatorWrapper { ValidatorWrapper { inner: versioned::create(1, validator, ctx) } @@ -22,13 +22,13 @@ module iota_system::validator_wrapper { /// This function should always return the latest supported version. /// If the inner version is old, we upgrade it lazily in-place. - public(package) fun load_validator_maybe_upgrade(self: &mut ValidatorWrapper): &mut Validator { + public(package) fun load_validator_maybe_upgrade(self: &mut ValidatorWrapper): &mut ValidatorV1 { upgrade_to_latest(self); versioned::load_value_mut(&mut self.inner) } /// Destroy the wrapper and retrieve the inner validator object. - public(package) fun destroy(self: ValidatorWrapper): Validator { + public(package) fun destroy(self: ValidatorWrapper): ValidatorV1 { upgrade_to_latest(&self); let ValidatorWrapper { inner } = self; versioned::destroy(inner) @@ -36,7 +36,7 @@ module iota_system::validator_wrapper { #[test_only] /// Load the inner validator with assumed type. This should be used for testing only. - public(package) fun get_inner_validator_ref(self: &ValidatorWrapper): &Validator { + public(package) fun get_inner_validator_ref(self: &ValidatorWrapper): &ValidatorV1 { versioned::load_value(&self.inner) } diff --git a/crates/iota-framework/packages/iota-system/sources/voting_power.move b/crates/iota-framework/packages/iota-system/sources/voting_power.move index d5a0cc68b8b..2c839fe6a84 100644 --- a/crates/iota-framework/packages/iota-system/sources/voting_power.move +++ b/crates/iota-framework/packages/iota-system/sources/voting_power.move @@ -3,16 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 module iota_system::voting_power { - use iota_system::validator::Validator; + use iota_system::validator::ValidatorV1; - #[allow(unused_field)] - /// Deprecated. Use VotingPowerInfoV2 instead. - public struct VotingPowerInfo has drop { - validator_index: u64, - voting_power: u64, - } - - public struct VotingPowerInfoV2 has drop { + public struct VotingPowerInfoV1 has drop { validator_index: u64, voting_power: u64, stake: u64, @@ -41,7 +34,7 @@ module iota_system::voting_power { /// Set the voting power of all validators. /// Each validator's voting power is initialized using their stake. We then attempt to cap their voting power /// at `MAX_VOTING_POWER`. If `MAX_VOTING_POWER` is not a feasible cap, we pick the lowest possible cap. - public(package) fun set_voting_power(validators: &mut vector) { + public(package) fun set_voting_power(validators: &mut vector) { // If threshold_pct is too small, it's possible that even when all validators reach the threshold we still don't // have 100%. So we bound the threshold_pct to be always enough to find a solution. let threshold = TOTAL_VOTING_POWER.min( @@ -58,9 +51,9 @@ module iota_system::voting_power { /// descending order using voting power. /// Anything beyond the threshold is added to the remaining_power, which is also returned. fun init_voting_power_info( - validators: &vector, + validators: &vector, threshold: u64, - ): (vector, u64) { + ): (vector, u64) { let total_stake = total_stake(validators); let mut i = 0; let len = validators.length(); @@ -71,7 +64,7 @@ module iota_system::voting_power { let stake = validator.total_stake(); let adjusted_stake = stake as u128 * (TOTAL_VOTING_POWER as u128) / (total_stake as u128); let voting_power = (adjusted_stake as u64).min(threshold); - let info = VotingPowerInfoV2 { + let info = VotingPowerInfoV1 { validator_index: i, voting_power, stake, @@ -84,7 +77,7 @@ module iota_system::voting_power { } /// Sum up the total stake of all validators. - fun total_stake(validators: &vector): u64 { + fun total_stake(validators: &vector): u64 { let mut i = 0; let len = validators.length(); let mut total_stake =0 ; @@ -97,7 +90,7 @@ module iota_system::voting_power { /// Insert `new_info` to `info_list` as part of insertion sort, such that `info_list` is always sorted /// using stake, in descending order. - fun insert(info_list: &mut vector, new_info: VotingPowerInfoV2) { + fun insert(info_list: &mut vector, new_info: VotingPowerInfoV1) { let mut i = 0; let len = info_list.length(); while (i < len && info_list[i].stake > new_info.stake) { @@ -107,7 +100,7 @@ module iota_system::voting_power { } /// Distribute remaining_power to validators that are not capped at threshold. - fun adjust_voting_power(info_list: &mut vector, threshold: u64, mut remaining_power: u64) { + fun adjust_voting_power(info_list: &mut vector, threshold: u64, mut remaining_power: u64) { let mut i = 0; let len = info_list.length(); while (i < len && remaining_power > 0) { @@ -127,9 +120,9 @@ module iota_system::voting_power { } /// Update validators with the decided voting power. - fun update_voting_power(validators: &mut vector, mut info_list: vector) { + fun update_voting_power(validators: &mut vector, mut info_list: vector) { while (!info_list.is_empty()) { - let VotingPowerInfoV2 { + let VotingPowerInfoV1 { validator_index, voting_power, stake: _, @@ -141,7 +134,7 @@ module iota_system::voting_power { } /// Check a few invariants that must hold after setting the voting power. - fun check_invariants(v: &vector) { + fun check_invariants(v: &vector) { // First check that the total voting power must be TOTAL_VOTING_POWER. let mut i = 0; let len = v.length(); diff --git a/crates/iota-framework/packages/iota-system/tests/delegation_tests.move b/crates/iota-framework/packages/iota-system/tests/delegation_tests.move index 7a233847c4f..0b1bbecce25 100644 --- a/crates/iota-framework/packages/iota-system/tests/delegation_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/delegation_tests.move @@ -7,7 +7,7 @@ module iota_system::stake_tests { use iota::coin; use iota::test_scenario; use iota_system::iota_system::IotaSystemState; - use iota_system::staking_pool::{Self, StakedIota, PoolTokenExchangeRate}; + use iota_system::staking_pool::{Self, StakedIotaV1, PoolTokenExchangeRateV1}; use iota::test_utils::assert_eq; use iota_system::validator_set; use iota::test_utils; @@ -45,7 +45,7 @@ module iota_system::stake_tests { #[test] fun test_split_join_staked_iota() { - // All this is just to generate a dummy StakedIota object to split and join later + // All this is just to generate a dummy StakedIotaV1 object to split and join later set_up_iota_system_state(); let mut scenario_val = test_scenario::begin(STAKER_ADDR_1); let scenario = &mut scenario_val; @@ -53,7 +53,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); staked_iota.split_to_sender(20 * NANOS_PER_IOTA, ctx); scenario.return_to_sender(staked_iota); @@ -62,12 +62,12 @@ module iota_system::stake_tests { // Verify the correctness of the split and send the join txn scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); + let staked_iota_ids = scenario.ids_for_sender(); assert!(staked_iota_ids.length() == 2); // staked iota split to 2 coins - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); let amount1 = part1.amount(); let amount2 = part2.amount(); @@ -98,9 +98,9 @@ module iota_system::stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -120,7 +120,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. staked_iota.split_to_sender(1 * NANOS_PER_IOTA + 1, ctx); @@ -140,7 +140,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. let stake = staked_iota.split(1 * NANOS_PER_IOTA + 1, ctx); @@ -179,7 +179,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert!(staked_iota.amount() == 60 * NANOS_PER_IOTA); @@ -255,7 +255,7 @@ module iota_system::stake_tests { assert!(!system_state_mut_ref.validators().is_active_validator_by_iota_address(VALIDATOR_ADDR_1)); - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -304,7 +304,7 @@ module iota_system::stake_tests { let mut system_state = scenario.take_shared(); let system_state_mut_ref = &mut system_state; - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -517,7 +517,7 @@ module iota_system::stake_tests { let scenario = &mut scenario_val; stake_with(@0x42, @0x2, 100, scenario); // stakes 100 IOTA with 0x2 scenario.next_tx(@0x42); - let staked_iota = scenario.take_from_address(@0x42); + let staked_iota = scenario.take_from_address(@0x42); let pool_id = staked_iota.pool_id(); test_scenario::return_to_address(@0x42, staked_iota); advance_epoch(scenario); // advances epoch to effectuate the stake @@ -534,7 +534,7 @@ module iota_system::stake_tests { } fun assert_exchange_rate_eq( - rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 + rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 ) { let rate = &rates[epoch]; assert_eq(rate.iota_amount(), iota_amount * NANOS_PER_IOTA); diff --git a/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move b/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move index 16e2c2a071a..86fc56f561a 100644 --- a/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move +++ b/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move @@ -8,9 +8,9 @@ module iota_system::governance_test_utils { use iota::balance; use iota::iota::{Self, IOTA}; use iota::coin::{Self, Coin}; - use iota_system::staking_pool::{StakedIota, StakingPool}; + use iota_system::staking_pool::{StakedIotaV1, StakingPoolV1}; use iota::test_utils::assert_eq; - use iota_system::validator::{Self, Validator}; + use iota_system::validator::{Self, ValidatorV1}; use iota_system::iota_system::{Self, IotaSystemState}; use iota_system::iota_system_state_inner; use iota::test_scenario::{Self, Scenario}; @@ -22,7 +22,7 @@ module iota_system::governance_test_utils { public fun create_validator_for_testing( addr: address, init_stake_amount_in_iota: u64, ctx: &mut TxContext - ): Validator { + ): ValidatorV1 { let validator = validator::new_for_testing( addr, x"AA", @@ -47,7 +47,7 @@ module iota_system::governance_test_utils { } /// Create a validator set with the given stake amounts - public fun create_validators_with_stakes(stakes: vector, ctx: &mut TxContext): vector { + public fun create_validators_with_stakes(stakes: vector, ctx: &mut TxContext): vector { let mut i = 0; let mut validators = vector[]; while (i < stakes.length()) { @@ -59,7 +59,7 @@ module iota_system::governance_test_utils { } public fun create_iota_system_state_for_testing( - validators: vector, iota_supply_amount: u64, storage_fund_amount: u64, ctx: &mut TxContext + validators: vector, iota_supply_amount: u64, storage_fund_amount: u64, ctx: &mut TxContext ) { let system_parameters = iota_system_state_inner::create_system_parameters( 42, // epoch_duration_ms, doesn't matter what number we put here @@ -188,7 +188,7 @@ module iota_system::governance_test_utils { staker: address, staked_iota_idx: u64, scenario: &mut Scenario ) { scenario.next_tx(staker); - let stake_iota_ids = scenario.ids_for_sender(); + let stake_iota_ids = scenario.ids_for_sender(); let staked_iota = scenario.take_from_sender_by_id(stake_iota_ids[staked_iota_idx]); let mut system_state = scenario.take_shared(); @@ -328,15 +328,15 @@ module iota_system::governance_test_utils { amount } - public fun stake_plus_current_rewards(addr: address, staking_pool: &StakingPool, scenario: &mut Scenario): u64 { + public fun stake_plus_current_rewards(addr: address, staking_pool: &StakingPoolV1, scenario: &mut Scenario): u64 { let mut sum = 0; scenario.next_tx(addr); - let mut stake_ids = scenario.ids_for_sender(); + let mut stake_ids = scenario.ids_for_sender(); let current_epoch = scenario.ctx().epoch(); while (!stake_ids.is_empty()) { let staked_iota_id = stake_ids.pop_back(); - let staked_iota = scenario.take_from_sender_by_id(staked_iota_id); + let staked_iota = scenario.take_from_sender_by_id(staked_iota_id); sum = sum + staking_pool.calculate_rewards(&staked_iota, current_epoch); scenario.return_to_sender(staked_iota); }; diff --git a/crates/iota-framework/packages/iota-system/tests/iota_system_tests.move b/crates/iota-framework/packages/iota-system/tests/iota_system_tests.move index a8cc154be70..fba2dc51c51 100644 --- a/crates/iota-framework/packages/iota-system/tests/iota_system_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/iota_system_tests.move @@ -13,7 +13,7 @@ module iota_system::iota_system_tests { use iota_system::governance_test_utils::{add_validator_full_flow, advance_epoch, remove_validator, set_up_iota_system_state, create_iota_system_state_for_testing, stake_with, unstake}; use iota_system::iota_system::IotaSystemState; use iota_system::iota_system_state_inner; - use iota_system::validator::{Self, Validator}; + use iota_system::validator::{Self, ValidatorV1}; use iota_system::validator_set; use iota_system::validator_cap::UnverifiedValidatorOperationCap; use iota::balance; @@ -383,7 +383,7 @@ module iota_system::iota_system_tests { fun verify_candidate( - validator: &Validator, + validator: &ValidatorV1, name: vector, protocol_pub_key: vector, pop: vector, @@ -442,7 +442,7 @@ module iota_system::iota_system_tests { } fun verify_metadata( - validator: &Validator, + validator: &ValidatorV1, name: vector, protocol_pub_key: vector, pop: vector, @@ -495,7 +495,7 @@ module iota_system::iota_system_tests { } fun verify_current_epoch_metadata( - validator: &Validator, + validator: &ValidatorV1, name: vector, protocol_pub_key: vector, pop: vector, @@ -523,7 +523,7 @@ module iota_system::iota_system_tests { fun verify_metadata_after_advancing_epoch( - validator: &Validator, + validator: &ValidatorV1, name: vector, protocol_pub_key: vector, pop: vector, diff --git a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move index 2b2ba3689d0..de7a4395232 100644 --- a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move @@ -14,8 +14,8 @@ module iota_system::timelocked_stake_tests { use iota::test_utils; use iota_system::iota_system::IotaSystemState; - use iota_system::staking_pool::{Self, PoolTokenExchangeRate}; - use iota_system::validator_set::{Self, ValidatorSet}; + use iota_system::staking_pool::{Self, PoolTokenExchangeRateV1}; + use iota_system::validator_set::{Self, ValidatorSetV1}; use iota_system::governance_test_utils::{ add_validator, add_validator_candidate, @@ -30,7 +30,7 @@ module iota_system::timelocked_stake_tests { total_iota_balance, unstake, }; - use iota_system::timelocked_staking::{Self, TimelockedStakedIota}; + use iota_system::timelocked_staking::{Self, TimelockedStakedIotaV1}; use iota::labeler::LabelerCap; use iota::timelock::{Self, TimeLock}; @@ -63,7 +63,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); staked_iota.split_to_sender(20 * NANOS_PER_IOTA, ctx); scenario.return_to_sender(staked_iota); @@ -72,11 +72,11 @@ module iota_system::timelocked_stake_tests { // Verify the correctness of the split and send the join txn scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); + let staked_iota_ids = scenario.ids_for_sender(); assert!(staked_iota_ids.length() == 2, 101); // staked iota split to 2 coins - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); let amount1 = part1.amount(); let amount2 = part2.amount(); @@ -105,9 +105,9 @@ module iota_system::timelocked_stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -129,9 +129,9 @@ module iota_system::timelocked_stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -163,9 +163,9 @@ module iota_system::timelocked_stake_tests { // Verify that these can be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -204,9 +204,9 @@ module iota_system::timelocked_stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -239,7 +239,7 @@ module iota_system::timelocked_stake_tests { // Verify that it can be split scenario.next_tx(STAKER_ADDR_1); { - let mut original = scenario.take_from_sender(); + let mut original = scenario.take_from_sender(); let split = original.split(20 * NANOS_PER_IOTA, scenario.ctx()); assert_eq(original.staked_iota_amount(), 40 * NANOS_PER_IOTA); @@ -267,7 +267,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. staked_iota.split_to_sender(1 * NANOS_PER_IOTA + 1, ctx); @@ -287,7 +287,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. let stake = staked_iota.split(1 * NANOS_PER_IOTA + 1, ctx); @@ -328,7 +328,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -394,7 +394,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -468,11 +468,11 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let stake_iota_ids = scenario.ids_for_sender(); + let stake_iota_ids = scenario.ids_for_sender(); - let staked_iota1 = scenario.take_from_sender_by_id(stake_iota_ids[0]); + let staked_iota1 = scenario.take_from_sender_by_id(stake_iota_ids[0]); assert_eq(staked_iota1.amount(), 30 * NANOS_PER_IOTA); - let staked_iota2 = scenario.take_from_sender_by_id(stake_iota_ids[1]); + let staked_iota2 = scenario.take_from_sender_by_id(stake_iota_ids[1]); assert_eq(staked_iota2.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -496,7 +496,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -518,7 +518,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - assert_eq(scenario.has_most_recent_for_sender(), false); + assert_eq(scenario.has_most_recent_for_sender(), false); let mut system_state = scenario.take_shared(); let system_state_mut_ref = &mut system_state; @@ -562,7 +562,7 @@ module iota_system::timelocked_stake_tests { assert!(!is_active_validator_by_iota_address(system_state_mut_ref.validators(), VALIDATOR_ADDR_1), 0); - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -620,7 +620,7 @@ module iota_system::timelocked_stake_tests { assert!(!is_active_validator_by_iota_address(system_state_mut_ref.validators(), VALIDATOR_ADDR_1), 0); - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -670,7 +670,7 @@ module iota_system::timelocked_stake_tests { let mut system_state = scenario.take_shared(); let system_state_mut_ref = &mut system_state; - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -893,7 +893,7 @@ module iota_system::timelocked_stake_tests { let scenario = &mut scenario_val; stake_timelocked_with(@0x42, @0x2, 100, 10, scenario); // stakes 100 IOTA with 0x2 scenario.next_tx(@0x42); - let staked_iota = scenario.take_from_address(@0x42); + let staked_iota = scenario.take_from_address(@0x42); let pool_id = staked_iota.pool_id(); test_scenario::return_to_address(@0x42, staked_iota); advance_epoch(scenario); // advances epoch to effectuate the stake @@ -987,7 +987,7 @@ module iota_system::timelocked_stake_tests { } fun assert_exchange_rate_eq( - rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 + rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 ) { let rate = &rates[epoch]; assert_eq(rate.iota_amount(), iota_amount * NANOS_PER_IOTA); @@ -1081,7 +1081,7 @@ module iota_system::timelocked_stake_tests { staker: address, staked_iota_idx: u64, scenario: &mut Scenario ) { scenario.next_tx(staker); - let stake_iota_ids = scenario.ids_for_sender(); + let stake_iota_ids = scenario.ids_for_sender(); let staked_iota = scenario.take_from_sender_by_id(stake_iota_ids[staked_iota_idx]); let mut system_state = scenario.take_shared(); @@ -1115,7 +1115,7 @@ module iota_system::timelocked_stake_tests { scenario.has_most_recent_for_sender>() } - fun is_active_validator_by_iota_address(set: &ValidatorSet, validator_address: address): bool { + fun is_active_validator_by_iota_address(set: &ValidatorSetV1, validator_address: address): bool { let validators = set.active_validators(); let length = validators.length(); let mut i = 0; diff --git a/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move b/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move index 6d8466dd50e..70589d844f1 100644 --- a/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move @@ -6,9 +6,9 @@ module iota_system::validator_set_tests { use iota::balance; use iota::coin; - use iota_system::staking_pool::StakedIota; - use iota_system::validator::{Self, Validator, staking_pool_id}; - use iota_system::validator_set::{Self, ValidatorSet, active_validator_addresses}; + use iota_system::staking_pool::StakedIotaV1; + use iota_system::validator::{Self, ValidatorV1, staking_pool_id}; + use iota_system::validator_set::{Self, ValidatorSetV1, active_validator_addresses}; use iota::test_scenario::{Self, Scenario}; use iota::test_utils::{Self, assert_eq}; use iota::vec_map; @@ -368,7 +368,7 @@ module iota_system::validator_set_tests { // Withdraw the stake from @0x4. scenario.next_tx(@0x42); { - let stake = scenario.take_from_sender(); + let stake = scenario.take_from_sender(); let ctx = scenario.ctx(); let withdrawn_balance = validator_set.request_withdraw_stake( stake, @@ -399,7 +399,7 @@ module iota_system::validator_set_tests { scenario_val.end(); } - fun create_validator(addr: address, hint: u8, gas_price: u64, is_initial_validator: bool, ctx: &mut TxContext): Validator { + fun create_validator(addr: address, hint: u8, gas_price: u64, is_initial_validator: bool, ctx: &mut TxContext): ValidatorV1 { let stake_value = hint as u64 * 100 * NANOS_PER_IOTA; let name = hint_to_ascii(hint); let validator = validator::new_for_testing( @@ -430,7 +430,7 @@ module iota_system::validator_set_tests { ascii_bytes.to_ascii_string().into_bytes() } - fun advance_epoch_with_dummy_rewards(validator_set: &mut ValidatorSet, scenario: &mut Scenario) { + fun advance_epoch_with_dummy_rewards(validator_set: &mut ValidatorSetV1, scenario: &mut Scenario) { scenario.next_epoch(@0x0); let mut dummy_computation_reward = balance::zero(); @@ -448,7 +448,7 @@ module iota_system::validator_set_tests { } fun advance_epoch_with_low_stake_params( - validator_set: &mut ValidatorSet, + validator_set: &mut ValidatorSetV1, low_stake_threshold: u64, very_low_stake_threshold: u64, low_stake_grace_period: u64, @@ -469,7 +469,7 @@ module iota_system::validator_set_tests { dummy_computation_reward.destroy_zero(); } - fun add_and_activate_validator(validator_set: &mut ValidatorSet, validator: Validator, scenario: &mut Scenario) { + fun add_and_activate_validator(validator_set: &mut ValidatorSetV1, validator: ValidatorV1, scenario: &mut Scenario) { scenario.next_tx(validator.iota_address()); let ctx = scenario.ctx(); validator_set.request_add_validator_candidate(validator, ctx); diff --git a/crates/iota-framework/packages/iota-system/tests/validator_tests.move b/crates/iota-framework/packages/iota-system/tests/validator_tests.move index 12f2078c64d..6a6c361c3fc 100644 --- a/crates/iota-framework/packages/iota-system/tests/validator_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/validator_tests.move @@ -11,8 +11,8 @@ module iota_system::validator_tests { use iota::test_scenario; use iota::test_utils; use iota::url; - use iota_system::staking_pool::StakedIota; - use iota_system::validator::{Self, Validator}; + use iota_system::staking_pool::StakedIotaV1; + use iota_system::validator::{Self, ValidatorV1}; const VALID_NET_PUBKEY: vector = vector[171, 2, 39, 3, 139, 105, 166, 171, 153, 151, 102, 197, 151, 186, 140, 116, 114, 90, 213, 225, 20, 167, 60, 69, 203, 12, 180, 198, 9, 217, 117, 38]; @@ -32,7 +32,7 @@ module iota_system::validator_tests { const TOO_LONG_257_BYTES: vector = b"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; #[test_only] - fun get_test_validator(ctx: &mut TxContext): Validator { + fun get_test_validator(ctx: &mut TxContext): ValidatorV1 { let init_stake = coin::mint_for_testing(10_000_000_000, ctx).into_balance(); let mut validator = validator::new( VALID_ADDRESS, @@ -82,7 +82,7 @@ module iota_system::validator_tests { // Check that after destroy, the original stake still exists. scenario.next_tx(sender); { - let stake = scenario.take_from_sender(); + let stake = scenario.take_from_sender(); assert!(stake.amount() == 10_000_000_000); scenario.return_to_sender(stake); }; @@ -110,8 +110,8 @@ module iota_system::validator_tests { scenario.next_tx(sender); { - let coin_ids = scenario.ids_for_sender(); - let stake = scenario.take_from_sender_by_id(coin_ids[0]); + let coin_ids = scenario.ids_for_sender(); + let stake = scenario.take_from_sender_by_id(coin_ids[0]); let ctx = scenario.ctx(); let withdrawn_balance = validator.request_withdraw_stake(stake, ctx); transfer::public_transfer(withdrawn_balance.into_coin(ctx), sender); @@ -650,7 +650,7 @@ module iota_system::validator_tests { tear_down(validator, scenario); } - fun set_up(): (address, test_scenario::Scenario, validator::Validator) { + fun set_up(): (address, test_scenario::Scenario, validator::ValidatorV1) { let sender = VALID_ADDRESS; let mut scenario_val = test_scenario::begin(sender); let ctx = scenario_val.ctx(); @@ -658,7 +658,7 @@ module iota_system::validator_tests { (sender, scenario_val, validator) } - fun tear_down(validator: validator::Validator, scenario: test_scenario::Scenario) { + fun tear_down(validator: validator::ValidatorV1, scenario: test_scenario::Scenario) { test_utils::destroy(validator); scenario.end(); } diff --git a/crates/iota-framework/packages/iota-system/tests/voting_power_tests.move b/crates/iota-framework/packages/iota-system/tests/voting_power_tests.move index 799ca5dc71c..f9aa8ac8965 100644 --- a/crates/iota-framework/packages/iota-system/tests/voting_power_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/voting_power_tests.move @@ -8,7 +8,7 @@ module iota_system::voting_power_tests { use iota_system::voting_power; use iota::test_scenario; use iota::test_utils; - use iota_system::validator::{Self, Validator}; + use iota_system::validator::{Self, ValidatorV1}; const TOTAL_VOTING_POWER: u64 = 10_000; @@ -68,7 +68,7 @@ module iota_system::voting_power_tests { scenario.end(); } - fun get_voting_power(validators: &vector): vector { + fun get_voting_power(validators: &vector): vector { let mut result = vector[]; let mut i = 0; let len = validators.length(); From 23a5d0f6c45dfec4bf725ba91d4ec025397ffb7f Mon Sep 17 00:00:00 2001 From: muXxer Date: Mon, 14 Oct 2024 17:25:49 +0200 Subject: [PATCH 02/62] chore(core-node)!: remove deprecated db tables (#3142) * !chore(core-node): remove deprecated tables in `AuthorityEpochTables` * !chore(core-node): remove deprecated tables in `IndexStoreTables` * chore(scripts): add `target` to ignored_dirs --- crates/iota-core/src/authority.rs | 6 -- .../authority/authority_per_epoch_store.rs | 75 +++----------- crates/iota-core/src/epoch/randomness.rs | 6 +- crates/iota-storage/src/indexes.rs | 99 +------------------ crates/iota-tool/src/db_tool/index_search.rs | 37 ------- 5 files changed, 24 insertions(+), 199 deletions(-) diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs index d7b558d4d2f..4cafadedec1 100644 --- a/crates/iota-core/src/authority.rs +++ b/crates/iota-core/src/authority.rs @@ -2132,12 +2132,6 @@ impl AuthorityState { indexes .index_tx( cert.data().intent_message().value.sender(), - cert.data() - .intent_message() - .value - .input_objects()? - .iter() - .map(|o| o.object_id()), effects .all_changed_objects() .into_iter() diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 8f93f6bf72e..5e51609e029 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -482,10 +482,6 @@ pub struct AuthorityEpochTables { #[default_options_override_fn = "pending_consensus_transactions_table_default_config"] pending_consensus_transactions: DBMap, - /// this table is not used - #[allow(dead_code)] - consensus_message_order: DBMap, - /// The following table is used to store a single value (the corresponding /// key is a constant). The value represents the index of the latest /// consensus message this authority processed. This field is written by @@ -501,10 +497,6 @@ pub struct AuthorityEpochTables { /// This field is written by a single process (consensus handler). last_consensus_stats: DBMap, - /// this table is not used - #[allow(dead_code)] - checkpoint_boundary: DBMap, - /// This table contains current reconfiguration state for validator for /// current epoch reconfig_state: DBMap, @@ -512,10 +504,6 @@ pub struct AuthorityEpochTables { /// Validators that have sent EndOfPublish message in this epoch end_of_publish: DBMap, - // TODO: Unused. Remove when removal of DBMap tables is supported. - #[allow(dead_code)] - final_epoch_checkpoint: DBMap, - /// This table has information for the checkpoints for which we constructed /// all the data from consensus, but not yet constructed actual /// checkpoint. @@ -549,12 +537,9 @@ pub struct AuthorityEpochTables { /// checkpoint later. user_signatures_for_checkpoints: DBMap>, - /// This table is not used - #[allow(dead_code)] - builder_checkpoint_summary: DBMap, /// Maps sequence number to checkpoint summary, used by CheckpointBuilder to /// build checkpoint within epoch - builder_checkpoint_summary_v2: DBMap, + builder_checkpoint_summary: DBMap, // Maps checkpoint sequence number to an accumulator with accumulated state // only for the checkpoint that the key references. Append-only, i.e., @@ -580,11 +565,6 @@ pub struct AuthorityEpochTables { pub(crate) executed_transactions_to_checkpoint: DBMap, - /// This table is no longer used (can be removed when DBMap supports - /// removing tables) - #[allow(dead_code)] - oauth_provider_jwk: DBMap, - /// JWKs that have been voted for by one or more authorities but are not yet /// active. pending_jwks: DBMap<(AuthorityName, JwkId, JWK), ()>, @@ -598,51 +578,31 @@ pub struct AuthorityEpochTables { /// Transactions that are being deferred until some future time deferred_transactions: DBMap>, - /// This table is no longer used (can be removed when DBMap supports - /// removing tables) - #[allow(dead_code)] - randomness_rounds_written: DBMap, - /// Tables for recording state for RandomnessManager. /// Records messages processed from other nodes. Updated when receiving a /// new dkg::Message via consensus. - pub(crate) dkg_processed_messages_v2: DBMap, - /// This table is no longer used (can be removed when DBMap supports - /// removing tables) - #[allow(dead_code)] - #[deprecated] - pub(crate) dkg_processed_messages: DBMap>, + pub(crate) dkg_processed_messages: DBMap, /// Records messages used to generate a DKG confirmation. Updated when /// enough DKG messages are received to progress to the next phase. - pub(crate) dkg_used_messages_v2: DBMap, - /// This table is no longer used (can be removed when DBMap supports - /// removing tables) - #[allow(dead_code)] - #[deprecated] - pub(crate) dkg_used_messages: DBMap>, + pub(crate) dkg_used_messages: DBMap, /// Records confirmations received from other nodes. Updated when receiving /// a new dkg::Confirmation via consensus. - pub(crate) dkg_confirmations_v2: DBMap, - /// This table is no longer used (can be removed when DBMap supports - /// removing tables) - #[allow(dead_code)] - #[deprecated] - pub(crate) dkg_confirmations: DBMap>, + pub(crate) dkg_confirmations: DBMap, + /// Records the final output of DKG after completion, including the public /// VSS key and any local private shares. pub(crate) dkg_output: DBMap>, - /// This table is no longer used (can be removed when DBMap supports - /// removing tables) - #[allow(dead_code)] - randomness_rounds_pending: DBMap, + /// Holds the value of the next RandomnessRound to be generated. pub(crate) randomness_next_round: DBMap, + /// Holds the value of the highest completed RandomnessRound (as reported to /// RandomnessReporter). pub(crate) randomness_highest_completed_round: DBMap, + /// Holds the timestamp of the most recently generated round of randomness. pub(crate) randomness_last_round_timestamp: DBMap, } @@ -3766,7 +3726,7 @@ impl AuthorityPerEpochStore { checkpoint_height: Some(commit_height), position_in_commit, }; - batch.insert_batch(&self.tables()?.builder_checkpoint_summary_v2, [( + batch.insert_batch(&self.tables()?.builder_checkpoint_summary, [( &sequence_number, summary, )])?; @@ -3804,7 +3764,7 @@ impl AuthorityPerEpochStore { position_in_commit: 0, }; self.tables()? - .builder_checkpoint_summary_v2 + .builder_checkpoint_summary .insert(summary.sequence_number(), &builder_summary)?; Ok(()) } @@ -3814,7 +3774,7 @@ impl AuthorityPerEpochStore { ) -> IotaResult> { Ok(self .tables()? - .builder_checkpoint_summary_v2 + .builder_checkpoint_summary .unbounded_iter() .skip_to_last() .next() @@ -3826,7 +3786,7 @@ impl AuthorityPerEpochStore { ) -> IotaResult> { Ok(self .tables()? - .builder_checkpoint_summary_v2 + .builder_checkpoint_summary .unbounded_iter() .skip_to_last() .next() @@ -3839,7 +3799,7 @@ impl AuthorityPerEpochStore { ) -> IotaResult> { Ok(self .tables()? - .builder_checkpoint_summary_v2 + .builder_checkpoint_summary .get(&sequence)? .map(|s| s.summary)) } @@ -4208,13 +4168,10 @@ impl ConsensusCommitOutput { )])?; } - batch.insert_batch(&tables.dkg_confirmations_v2, self.dkg_confirmations)?; - batch.insert_batch( - &tables.dkg_processed_messages_v2, - self.dkg_processed_messages, - )?; + batch.insert_batch(&tables.dkg_confirmations, self.dkg_confirmations)?; + batch.insert_batch(&tables.dkg_processed_messages, self.dkg_processed_messages)?; batch.insert_batch( - &tables.dkg_used_messages_v2, + &tables.dkg_used_messages, // using Option as iter self.dkg_used_message .into_iter() diff --git a/crates/iota-core/src/epoch/randomness.rs b/crates/iota-core/src/epoch/randomness.rs index bfc5df941a2..25d90520962 100644 --- a/crates/iota-core/src/epoch/randomness.rs +++ b/crates/iota-core/src/epoch/randomness.rs @@ -352,12 +352,12 @@ impl RandomnessManager { ); rm.processed_messages.extend( tables - .dkg_processed_messages_v2 + .dkg_processed_messages .safe_iter() .map(|result| result.expect("typed_store should not fail")), ); if let Some(used_messages) = tables - .dkg_used_messages_v2 + .dkg_used_messages .get(&SINGLETON_KEY) .expect("typed_store should not fail") { @@ -367,7 +367,7 @@ impl RandomnessManager { } rm.confirmations.extend( tables - .dkg_confirmations_v2 + .dkg_confirmations .safe_iter() .map(|result| result.expect("typed_store should not fail")), ); diff --git a/crates/iota-storage/src/indexes.rs b/crates/iota-storage/src/indexes.rs index 449fed79efa..2345a956180 100644 --- a/crates/iota-storage/src/indexes.rs +++ b/crates/iota-storage/src/indexes.rs @@ -160,33 +160,12 @@ pub struct IndexStoreTables { #[default_options_override_fn = "transactions_to_addr_table_default_config"] transactions_to_addr: DBMap<(IotaAddress, TxSequenceNumber), TransactionDigest>, - /// Index from object id to transactions that used that object id as input. - #[deprecated] - transactions_by_input_object_id: DBMap<(ObjectID, TxSequenceNumber), TransactionDigest>, - - /// Index from object id to transactions that modified/created that object - /// id. - #[deprecated] - transactions_by_mutated_object_id: DBMap<(ObjectID, TxSequenceNumber), TransactionDigest>, - /// Index from package id, module and function identifier to transactions /// that used that moce function call as input. #[default_options_override_fn = "transactions_by_move_function_table_default_config"] transactions_by_move_function: DBMap<(ObjectID, String, String, TxSequenceNumber), TransactionDigest>, - /// This is a map between the transaction digest and its timestamp (UTC - /// timestamp in **milliseconds** since epoch 1/1/1970). A transaction - /// digest is subjectively time stamped on a node according to the local - /// machine time, so it varies across nodes. The timestamping happens - /// when the node sees a txn certificate for the first time. - /// - /// DEPRECATED. DO NOT USE - #[allow(dead_code)] - #[default_options_override_fn = "timestamps_table_default_config"] - #[deprecated] - timestamps: DBMap, - /// Ordering of all indexed transactions. #[default_options_override_fn = "transactions_order_table_default_config"] transaction_order: DBMap, @@ -214,20 +193,21 @@ pub struct IndexStoreTables { #[default_options_override_fn = "dynamic_field_index_table_default_config"] dynamic_field_index: DBMap, - /// This is an index of all the versions of loaded child objects - #[deprecated] - loaded_child_object_versions: DBMap>, - #[default_options_override_fn = "index_table_default_config"] event_order: DBMap, + #[default_options_override_fn = "index_table_default_config"] event_by_move_module: DBMap<(ModuleId, EventId), EventIndex>, + #[default_options_override_fn = "index_table_default_config"] event_by_move_event: DBMap<(StructTag, EventId), EventIndex>, + #[default_options_override_fn = "index_table_default_config"] event_by_event_module: DBMap<(ModuleId, EventId), EventIndex>, + #[default_options_override_fn = "index_table_default_config"] event_by_sender: DBMap<(IotaAddress, EventId), EventIndex>, + #[default_options_override_fn = "index_table_default_config"] event_by_time: DBMap<(u64, EventId), EventIndex>, } @@ -270,11 +250,6 @@ fn transactions_to_addr_table_default_config() -> DBOptions { fn transactions_by_move_function_table_default_config() -> DBOptions { default_db_options().disable_write_throttling() } -fn timestamps_table_default_config() -> DBOptions { - default_db_options() - .optimize_for_point_lookup(64) - .disable_write_throttling() -} fn owner_index_table_default_config() -> DBOptions { default_db_options().disable_write_throttling() } @@ -483,7 +458,6 @@ impl IndexStore { pub async fn index_tx( &self, sender: IotaAddress, - active_inputs: impl Iterator, mutated_objects: impl Iterator + Clone, move_functions: impl Iterator + Clone, events: &TransactionEvents, @@ -510,21 +484,6 @@ impl IndexStore { std::iter::once(((sender, sequence), *digest)), )?; - #[allow(deprecated)] - if !self.remove_deprecated_tables { - batch.insert_batch( - &self.tables.transactions_by_input_object_id, - active_inputs.map(|id| ((id, sequence), *digest)), - )?; - - batch.insert_batch( - &self.tables.transactions_by_mutated_object_id, - mutated_objects - .clone() - .map(|(obj_ref, _)| ((obj_ref.0, sequence), *digest)), - )?; - } - batch.insert_batch( &self.tables.transactions_by_move_function, move_functions.map(|(obj_id, module, function)| { @@ -698,12 +657,6 @@ impl IndexStore { }) => Ok(self.get_transactions_by_move_function( package, module, function, cursor, limit, reverse, )?), - Some(TransactionFilter::InputObject(object_id)) => { - Ok(self.get_transactions_by_input_object(object_id, cursor, limit, reverse)?) - } - Some(TransactionFilter::ChangedObject(object_id)) => { - Ok(self.get_transactions_by_mutated_object(object_id, cursor, limit, reverse)?) - } Some(TransactionFilter::FromAddress(address)) => { Ok(self.get_transactions_from_addr(address, cursor, limit, reverse)?) } @@ -781,46 +734,6 @@ impl IndexStore { }) } - pub fn get_transactions_by_input_object( - &self, - input_object: ObjectID, - cursor: Option, - limit: Option, - reverse: bool, - ) -> IotaResult> { - if self.remove_deprecated_tables { - return Ok(vec![]); - } - #[allow(deprecated)] - Self::get_transactions_from_index( - &self.tables.transactions_by_input_object_id, - input_object, - cursor, - limit, - reverse, - ) - } - - pub fn get_transactions_by_mutated_object( - &self, - mutated_object: ObjectID, - cursor: Option, - limit: Option, - reverse: bool, - ) -> IotaResult> { - if self.remove_deprecated_tables { - return Ok(vec![]); - } - #[allow(deprecated)] - Self::get_transactions_from_index( - &self.tables.transactions_by_mutated_object_id, - mutated_object, - cursor, - limit, - reverse, - ) - } - pub fn get_transactions_from_addr( &self, addr: IotaAddress, @@ -1655,7 +1568,6 @@ mod tests { address, vec![].into_iter(), vec![].into_iter(), - vec![].into_iter(), &TransactionEvents { data: vec![] }, object_index_changes, &TransactionDigest::random(), @@ -1699,7 +1611,6 @@ mod tests { address, vec![].into_iter(), vec![].into_iter(), - vec![].into_iter(), &TransactionEvents { data: vec![] }, object_index_changes, &TransactionDigest::random(), diff --git a/crates/iota-tool/src/db_tool/index_search.rs b/crates/iota-tool/src/db_tool/index_search.rs index f1977538141..694b610467d 100644 --- a/crates/iota-tool/src/db_tool/index_search.rs +++ b/crates/iota-tool/src/db_tool/index_search.rs @@ -67,22 +67,6 @@ pub fn search_index( termination ) } - "transactions_by_input_object_id" => { - get_db_entries!( - db_read_only_handle.transactions_by_input_object_id, - from_id_seq, - start, - termination - ) - } - "transactions_by_mutated_object_id" => { - get_db_entries!( - db_read_only_handle.transactions_by_mutated_object_id, - from_id_seq, - start, - termination - ) - } "transactions_by_move_function" => { get_db_entries!( db_read_only_handle.transactions_by_move_function, @@ -131,14 +115,6 @@ pub fn search_index( termination ) } - "loaded_child_object_versions" => { - get_db_entries!( - db_read_only_handle.loaded_child_object_versions, - TransactionDigest::from_str, - start, - termination - ) - } "event_by_event_module" => { get_db_entries!( db_read_only_handle.event_by_event_module, @@ -265,19 +241,6 @@ fn from_addr_seq(s: &str) -> Result<(IotaAddress, TxSequenceNumber), anyhow::Err Ok((address, sequence_number)) } -fn from_id_seq(s: &str) -> Result<(ObjectID, TxSequenceNumber), anyhow::Error> { - // Remove whitespaces - let s = s.trim(); - let tokens = s.split(',').collect::>(); - if tokens.len() != 2 { - return Err(anyhow!("Invalid object id, sequence number pair")); - } - let oid = ObjectID::from_str(tokens[0].trim())?; - let sequence_number = TxSequenceNumber::from_str(tokens[1].trim())?; - - Ok((oid, sequence_number)) -} - fn from_id_module_function_txseq( s: &str, ) -> Result<(ObjectID, String, String, TxSequenceNumber), anyhow::Error> { From a92db11b8675d170cb18dc7bcfe86777faddfe82 Mon Sep 17 00:00:00 2001 From: muXxer Date: Mon, 14 Oct 2024 17:27:39 +0200 Subject: [PATCH 03/62] chore(core-node)!: remove unused `EpochFlags` + special `ExecutedInEpochTable` logic (#3139) * !chore(core-node): remove unused EpochFlags * !chore(core-node): remove ExecutedInEpochTable EpochFlag incl. special logic --- crates/iota-core/src/authority.rs | 26 +----------- .../authority/authority_per_epoch_store.rs | 40 ++----------------- .../authority/epoch_start_configuration.rs | 35 +++------------- crates/iota-core/src/checkpoints/mod.rs | 16 +------- 4 files changed, 11 insertions(+), 106 deletions(-) diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs index 4cafadedec1..0e9c1f0c80f 100644 --- a/crates/iota-core/src/authority.rs +++ b/crates/iota-core/src/authority.rs @@ -1471,25 +1471,6 @@ impl AuthorityState { let output_keys = inner_temporary_store.get_output_keys(effects); - // Only need to sign effects if we are a validator, and if the - // executed_in_epoch_table is not yet enabled. TODO: once - // executed_in_epoch_table is enabled everywhere, we can remove the code below - // entirely. - let should_sign_effects = - self.is_validator(epoch_store) && !epoch_store.executed_in_epoch_table_enabled(); - - let effects_sig = if should_sign_effects { - Some(AuthoritySignInfo::new( - epoch_store.epoch(), - effects, - Intent::iota_app(IntentScope::TransactionEffects), - self.name, - &*self.secret, - )) - } else { - None - }; - // index certificate let _ = self .post_process_one_tx(certificate, effects, &inner_temporary_store, epoch_store) @@ -1502,12 +1483,7 @@ impl AuthorityState { // The insertion to epoch_store is not atomic with the insertion to the // perpetual store. This is OK because we insert to the epoch store // first. And during lookups we always look up in the perpetual store first. - epoch_store.insert_tx_key_and_effects_signature( - &tx_key, - tx_digest, - &effects.digest(), - effects_sig.as_ref(), - )?; + epoch_store.insert_tx_key_and_digest(&tx_key, tx_digest)?; // Allow testing what happens if we crash here. fail_point_async!("crash"); diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 5e51609e029..9ca5db5d02a 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -380,8 +380,6 @@ pub struct AuthorityPerEpochStore { pub(crate) metrics: Arc, epoch_start_configuration: Arc, - executed_in_epoch_table_enabled: once_cell::sync::OnceCell, - /// Execution state that has to restart at each epoch change execution_component: ExecutionComponents, @@ -891,7 +889,6 @@ impl AuthorityPerEpochStore { epoch_close_time: Default::default(), metrics, epoch_start_configuration, - executed_in_epoch_table_enabled: once_cell::sync::OnceCell::new(), execution_component, chain_identifier, jwk_aggregator, @@ -988,14 +985,6 @@ impl AuthorityPerEpochStore { self.epoch_start_configuration.flags().contains(&flag) } - pub fn executed_in_epoch_table_enabled(&self) -> bool { - *self.executed_in_epoch_table_enabled.get_or_init(|| { - self.epoch_start_configuration - .flags() - .contains(&EpochFlag::ExecutedInEpochTable) - }) - } - /// Returns `&Arc` /// User can treat this `Arc` as `&EpochStartConfiguration`, or clone the /// Arc to pass as owned object @@ -1211,28 +1200,15 @@ impl AuthorityPerEpochStore { } #[instrument(level = "trace", skip_all)] - pub fn insert_tx_key_and_effects_signature( + pub fn insert_tx_key_and_digest( &self, tx_key: &TransactionKey, tx_digest: &TransactionDigest, - effects_digest: &TransactionEffectsDigest, - effects_signature: Option<&AuthoritySignInfo>, ) -> IotaResult { let tables = self.tables()?; let mut batch = self.tables()?.effects_signatures.batch(); - if self.executed_in_epoch_table_enabled() { - batch.insert_batch(&tables.executed_in_epoch, [(tx_digest, ())])?; - } - - if let Some(effects_signature) = effects_signature { - batch.insert_batch(&tables.effects_signatures, [(tx_digest, effects_signature)])?; - - batch.insert_batch(&tables.signed_effects_digests, [( - tx_digest, - effects_digest, - )])?; - } + batch.insert_batch(&tables.executed_in_epoch, [(tx_digest, ())])?; if !matches!(tx_key, TransactionKey::Digest(_)) { batch.insert_batch(&tables.transaction_key_to_digest, [(tx_key, tx_digest)])?; @@ -1276,11 +1252,7 @@ impl AuthorityPerEpochStore { digests: impl IntoIterator, ) -> IotaResult> { let tables = self.tables()?; - if self.executed_in_epoch_table_enabled() { - Ok(tables.executed_in_epoch.multi_contains_keys(digests)?) - } else { - Ok(tables.effects_signatures.multi_contains_keys(digests)?) - } + Ok(tables.executed_in_epoch.multi_contains_keys(digests)?) } pub fn get_effects_signature( @@ -3927,12 +3899,6 @@ impl AuthorityPerEpochStore { } pub(crate) fn check_all_executed_transactions_in_checkpoint(&self) { - if !self.executed_in_epoch_table_enabled() { - error!( - "Cannot check executed transactions in checkpoint because executed_in_epoch table is not enabled" - ); - return; - } let tables = self.tables().unwrap(); info!("Verifying that all executed transactions are in a checkpoint"); diff --git a/crates/iota-core/src/authority/epoch_start_configuration.rs b/crates/iota-core/src/authority/epoch_start_configuration.rs index 2457ba2bd17..251c6af9934 100644 --- a/crates/iota-core/src/authority/epoch_start_configuration.rs +++ b/crates/iota-core/src/authority/epoch_start_configuration.rs @@ -54,22 +54,10 @@ pub trait EpochStartConfigTrait { // inconsistent with the released branch, and must be fixed. #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)] pub enum EpochFlag { - // The deprecated flags have all been in production for long enough that - // we can have deleted the old code paths they were guarding. - // We retain them here in order not to break deserialization. - _InMemoryCheckpointRootsDeprecated = 0, - _PerEpochFinalizedTransactionsDeprecated = 1, - _ObjectLockSplitTablesDeprecated = 2, - - WritebackCacheEnabled = 3, - - // This flag was "burned" because it was deployed with a broken version of the code. The - // new flags below are required to enable state accumulator v2 - _StateAccumulatorV2EnabledDeprecated = 4, - StateAccumulatorV2EnabledTestnet = 5, - StateAccumulatorV2EnabledMainnet = 6, - - ExecutedInEpochTable = 7, + WritebackCacheEnabled = 0, + + StateAccumulatorV2EnabledTestnet = 1, + StateAccumulatorV2EnabledMainnet = 2, } impl EpochFlag { @@ -87,7 +75,7 @@ impl EpochFlag { cache_config: &ExecutionCacheConfig, enable_state_accumulator_v2: bool, ) -> Vec { - let mut new_flags = vec![EpochFlag::ExecutedInEpochTable]; + let mut new_flags = vec![]; if matches!( choose_execution_cache(cache_config), @@ -110,20 +98,7 @@ impl fmt::Display for EpochFlag { // Important - implementation should return low cardinality values because this // is used as metric key match self { - EpochFlag::_InMemoryCheckpointRootsDeprecated => { - write!(f, "InMemoryCheckpointRoots (DEPRECATED)") - } - EpochFlag::_PerEpochFinalizedTransactionsDeprecated => { - write!(f, "PerEpochFinalizedTransactions (DEPRECATED)") - } - EpochFlag::_ObjectLockSplitTablesDeprecated => { - write!(f, "ObjectLockSplitTables (DEPRECATED)") - } EpochFlag::WritebackCacheEnabled => write!(f, "WritebackCacheEnabled"), - EpochFlag::_StateAccumulatorV2EnabledDeprecated => { - write!(f, "StateAccumulatorV2EnabledDeprecated (DEPRECATED)") - } - EpochFlag::ExecutedInEpochTable => write!(f, "ExecutedInEpochTable"), EpochFlag::StateAccumulatorV2EnabledTestnet => { write!(f, "StateAccumulatorV2EnabledTestnet") } diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs index f1dc1e1a75d..1360e66b71b 100644 --- a/crates/iota-core/src/checkpoints/mod.rs +++ b/crates/iota-core/src/checkpoints/mod.rs @@ -2430,7 +2430,7 @@ mod tests { use iota_protocol_config::{Chain, ProtocolConfig}; use iota_types::{ base_types::{ObjectID, SequenceNumber, TransactionEffectsDigest}, - crypto::{AuthoritySignInfo, Signature}, + crypto::Signature, digests::TransactionEventsDigest, effects::{TransactionEffects, TransactionEvents}, messages_checkpoint::SignedCheckpointSummary, @@ -2438,7 +2438,6 @@ mod tests { object, transaction::{GenesisObject, VerifiedTransaction}, }; - use shared_crypto::intent::{Intent, IntentScope}; use tokio::sync::mpsc; use super::*; @@ -2808,18 +2807,7 @@ mod tests { let effects = e(digest, dependencies, gas_used); store.insert(digest, effects.clone()); epoch_store - .insert_tx_key_and_effects_signature( - &TransactionKey::Digest(digest), - &digest, - &effects.digest(), - Some(&AuthoritySignInfo::new( - epoch_store.epoch(), - &effects, - Intent::iota_app(IntentScope::TransactionEffects), - state.name, - &*state.secret, - )), - ) + .insert_tx_key_and_digest(&TransactionKey::Digest(digest), &digest) .expect("Inserting cert fx and sigs should not fail"); } } From 619c0481a7078d54e70683e4aa44c0999aac6b6a Mon Sep 17 00:00:00 2001 From: muXxer Date: Mon, 21 Oct 2024 11:17:58 +0200 Subject: [PATCH 04/62] refactor(iota-types/authenticator-state-update): Rename `AuthenticatorStateUpdate` (#3173) * refactor(iota-types/authenticator-state): Rename AuthenticatorStateUpdate * refactor(iota-types/authenticator-state): Fix fmt and clippy --- crates/iota-core/src/authority.rs | 2 +- .../authority/authority_per_epoch_store.rs | 4 ++-- crates/iota-core/src/checkpoints/mod.rs | 5 ++-- crates/iota-core/src/consensus_handler.rs | 2 +- .../src/unit_tests/transaction_tests.rs | 10 ++++---- crates/iota-e2e-tests/tests/zklogin_tests.rs | 6 ++--- .../authenticator_state_update.rs | 8 +++---- .../transaction_block_kind/end_of_epoch.rs | 2 +- .../src/types/transaction_block_kind/mod.rs | 8 +++---- .../src/iota_transaction.rs | 16 ++++++------- crates/iota-rosetta/src/types.rs | 6 ++--- crates/iota-types/src/transaction.rs | 24 +++++++++---------- crates/test-cluster/src/lib.rs | 2 +- .../iota-adapter/src/execution_engine.rs | 6 ++--- .../v0/iota-adapter/src/execution_engine.rs | 6 ++--- 15 files changed, 54 insertions(+), 53 deletions(-) diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs index 0e9c1f0c80f..6b58f58e50b 100644 --- a/crates/iota-core/src/authority.rs +++ b/crates/iota-core/src/authority.rs @@ -1407,7 +1407,7 @@ impl AuthorityState { ) .await?; - if let TransactionKind::AuthenticatorStateUpdate(auth_state) = + if let TransactionKind::AuthenticatorStateUpdateV1(auth_state) = certificate.data().transaction_data().kind() { if let Some(err) = &execution_error_opt { diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 9ca5db5d02a..235d0c4b0f4 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -57,7 +57,7 @@ use iota_types::{ signature::GenericSignature, storage::{BackingPackageStore, GetSharedLocks, InputKey, ObjectStore}, transaction::{ - AuthenticatorStateUpdate, CertifiedTransaction, InputObjectKind, SenderSignedData, + AuthenticatorStateUpdateV1, CertifiedTransaction, InputObjectKind, SenderSignedData, Transaction, TransactionDataAPI, TransactionKey, TransactionKind, VerifiedCertificate, VerifiedSignedTransaction, VerifiedTransaction, }, @@ -3886,7 +3886,7 @@ impl AuthorityPerEpochStore { .set(self.epoch_open_time.elapsed().as_millis() as i64); } - pub(crate) fn update_authenticator_state(&self, update: &AuthenticatorStateUpdate) { + pub(crate) fn update_authenticator_state(&self, update: &AuthenticatorStateUpdateV1) { info!("Updating authenticator state: {:?}", update); for active_jwk in &update.new_active_jwks { let ActiveJwk { jwk_id, jwk, .. } = active_jwk; diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs index 1360e66b71b..bb407acb2d7 100644 --- a/crates/iota-core/src/checkpoints/mod.rs +++ b/crates/iota-core/src/checkpoints/mod.rs @@ -1376,8 +1376,9 @@ impl CheckpointBuilder { .unwrap_or_else(|| panic!("Could not find executed transaction {:?}", effects)); match transaction.inner().transaction_data().kind() { TransactionKind::ConsensusCommitPrologueV1(_) - | TransactionKind::AuthenticatorStateUpdate(_) => { - // ConsensusCommitPrologue and AuthenticatorStateUpdate + | TransactionKind::AuthenticatorStateUpdateV1(_) => { + // ConsensusCommitPrologue and + // AuthenticatorStateUpdateV1 // are guaranteed to be // processed before we reach here. } diff --git a/crates/iota-core/src/consensus_handler.rs b/crates/iota-core/src/consensus_handler.rs index a603f5a46fd..1858ced4921 100644 --- a/crates/iota-core/src/consensus_handler.rs +++ b/crates/iota-core/src/consensus_handler.rs @@ -289,7 +289,7 @@ impl ConsensusHandler { let authenticator_state_update_transaction = self.authenticator_state_update_transaction(round, new_jwks); debug!( - "adding AuthenticatorStateUpdate({:?}) tx: {:?}", + "adding AuthenticatorStateUpdateV1({:?}) tx: {:?}", authenticator_state_update_transaction.digest(), authenticator_state_update_transaction, ); diff --git a/crates/iota-core/src/unit_tests/transaction_tests.rs b/crates/iota-core/src/unit_tests/transaction_tests.rs index 463055b4f48..cb15d42af08 100644 --- a/crates/iota-core/src/unit_tests/transaction_tests.rs +++ b/crates/iota-core/src/unit_tests/transaction_tests.rs @@ -26,7 +26,7 @@ use iota_types::{ multisig::{MultiSig, MultiSigPublicKey}, signature::GenericSignature, transaction::{ - AuthenticatorStateUpdate, GenesisTransaction, TransactionDataAPI, TransactionKind, + AuthenticatorStateUpdateV1, GenesisTransaction, TransactionDataAPI, TransactionKind, }, utils::{get_one_zklogin_inputs, load_test_vectors, to_sender_signed_transaction}, zk_login_authenticator::ZkLoginAuthenticator, @@ -991,7 +991,7 @@ async fn setup_zklogin_network( let gas_object_id = gas_object_ids[0]; let jwks = parse_jwks(DEFAULT_JWK_BYTES, &OIDCProvider::Twitch)?; let epoch_store = authority_state.epoch_store_for_testing(); - epoch_store.update_authenticator_state(&AuthenticatorStateUpdate { + epoch_store.update_authenticator_state(&AuthenticatorStateUpdateV1 { epoch: 0, round: 0, new_active_jwks: jwks @@ -1168,7 +1168,7 @@ async fn test_zklogin_txn_fail_if_missing_jwk() { // Initialize an authenticator state with a Google JWK. let jwks = parse_jwks(DEFAULT_JWK_BYTES, &OIDCProvider::Google).unwrap(); let epoch_store = authority_state.epoch_store_for_testing(); - epoch_store.update_authenticator_state(&AuthenticatorStateUpdate { + epoch_store.update_authenticator_state(&AuthenticatorStateUpdateV1 { epoch: 0, round: 0, new_active_jwks: jwks @@ -1200,7 +1200,7 @@ async fn test_zklogin_txn_fail_if_missing_jwk() { // Initialize an authenticator state with Twitch's kid as "nosuckkey". pub const BAD_JWK_BYTES: &[u8] = r#"{"keys":[{"alg":"RS256","e":"AQAB","kid":"nosuchkey","kty":"RSA","n":"6lq9MQ-q6hcxr7kOUp-tHlHtdcDsVLwVIw13iXUCvuDOeCi0VSuxCCUY6UmMjy53dX00ih2E4Y4UvlrmmurK0eG26b-HMNNAvCGsVXHU3RcRhVoHDaOwHwU72j7bpHn9XbP3Q3jebX6KIfNbei2MiR0Wyb8RZHE-aZhRYO8_-k9G2GycTpvc-2GBsP8VHLUKKfAs2B6sW3q3ymU6M0L-cFXkZ9fHkn9ejs-sqZPhMJxtBPBxoUIUQFTgv4VXTSv914f_YkNw-EjuwbgwXMvpyr06EyfImxHoxsZkFYB-qBYHtaMxTnFsZBr6fn8Ha2JqT1hoP7Z5r5wxDu3GQhKkHw","use":"sig"}]}"#.as_bytes(); let jwks = parse_jwks(BAD_JWK_BYTES, &OIDCProvider::Twitch).unwrap(); - epoch_store.update_authenticator_state(&AuthenticatorStateUpdate { + epoch_store.update_authenticator_state(&AuthenticatorStateUpdateV1 { epoch: 0, round: 0, new_active_jwks: jwks @@ -1245,7 +1245,7 @@ async fn test_zklogin_multisig() { let jwks = parse_jwks(DEFAULT_JWK_BYTES, &OIDCProvider::Twitch).unwrap(); let epoch_store = authority_state.epoch_store_for_testing(); - epoch_store.update_authenticator_state(&AuthenticatorStateUpdate { + epoch_store.update_authenticator_state(&AuthenticatorStateUpdateV1 { epoch: 0, round: 0, new_active_jwks: jwks diff --git a/crates/iota-e2e-tests/tests/zklogin_tests.rs b/crates/iota-e2e-tests/tests/zklogin_tests.rs index c96b212f78a..e32bbae1ade 100644 --- a/crates/iota-e2e-tests/tests/zklogin_tests.rs +++ b/crates/iota-e2e-tests/tests/zklogin_tests.rs @@ -199,8 +199,8 @@ async fn test_zklogin_auth_state_creation() { // Wait until we are in an epoch that has zklogin enabled, but the auth state // object is not created yet. test_cluster.wait_for_protocol_version(24.into()).await; - // Now wait until the auth state object is created, ie. AuthenticatorStateUpdate - // transaction happened. + // Now wait until the auth state object is created, ie. + // AuthenticatorStateUpdateV1 transaction happened. test_cluster.wait_for_authenticator_state_update().await; } @@ -289,7 +289,7 @@ async fn test_zklogin_conflicting_jwks() { .unwrap(); match &tx.data().intent_message().value.kind() { TransactionKind::EndOfEpochTransaction(_) => (), - TransactionKind::AuthenticatorStateUpdate(update) => { + TransactionKind::AuthenticatorStateUpdateV1(update) => { let jwks = &mut *jwks_clone.lock().unwrap(); for jwk in &update.new_active_jwks { jwks.push(jwk.clone()); diff --git a/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs b/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs index 2333105622b..6766706b014 100644 --- a/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs +++ b/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs @@ -8,7 +8,7 @@ use async_graphql::{ }; use iota_types::{ authenticator_state::ActiveJwk as NativeActiveJwk, - transaction::AuthenticatorStateUpdate as NativeAuthenticatorStateUpdateTransaction, + transaction::AuthenticatorStateUpdateV1 as NativeAuthenticatorStateUpdateV1Transaction, }; use crate::{ @@ -21,8 +21,8 @@ use crate::{ }; #[derive(Clone, PartialEq, Eq)] -pub(crate) struct AuthenticatorStateUpdateTransaction { - pub native: NativeAuthenticatorStateUpdateTransaction, +pub(crate) struct AuthenticatorStateUpdateV1Transaction { + pub native: NativeAuthenticatorStateUpdateV1Transaction, /// The checkpoint sequence number this was viewed at. pub checkpoint_viewed_at: u64, } @@ -39,7 +39,7 @@ struct ActiveJwk { /// System transaction for updating the on-chain state used by zkLogin. #[Object] -impl AuthenticatorStateUpdateTransaction { +impl AuthenticatorStateUpdateV1Transaction { /// Epoch of the authenticator state update transaction. async fn epoch(&self, ctx: &Context<'_>) -> Result> { Epoch::query(ctx, Some(self.native.epoch), self.checkpoint_viewed_at) diff --git a/crates/iota-graphql-rpc/src/types/transaction_block_kind/end_of_epoch.rs b/crates/iota-graphql-rpc/src/types/transaction_block_kind/end_of_epoch.rs index 9728f9e9611..abe06449a81 100644 --- a/crates/iota-graphql-rpc/src/types/transaction_block_kind/end_of_epoch.rs +++ b/crates/iota-graphql-rpc/src/types/transaction_block_kind/end_of_epoch.rs @@ -245,7 +245,7 @@ impl AuthenticatorStateExpireTransaction { .extend() } - /// The initial version that the AuthenticatorStateUpdate was shared at. + /// The initial version that the AuthenticatorStateUpdateV1 was shared at. async fn authenticator_obj_initial_shared_version(&self) -> UInt53 { self.native .authenticator_obj_initial_shared_version diff --git a/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs b/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs index a506e991cba..7cfe61fb3fd 100644 --- a/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs +++ b/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs @@ -11,7 +11,7 @@ use self::{ randomness_state_update::RandomnessStateUpdateTransaction, }; use crate::types::transaction_block_kind::{ - authenticator_state_update::AuthenticatorStateUpdateTransaction, + authenticator_state_update::AuthenticatorStateUpdateV1Transaction, end_of_epoch::EndOfEpochTransaction, programmable::ProgrammableTransactionBlock, }; @@ -30,7 +30,7 @@ pub(crate) enum TransactionBlockKind { Genesis(GenesisTransaction), ChangeEpoch(ChangeEpochTransaction), Programmable(ProgrammableTransactionBlock), - AuthenticatorState(AuthenticatorStateUpdateTransaction), + AuthenticatorState(AuthenticatorStateUpdateV1Transaction), Randomness(RandomnessStateUpdateTransaction), EndOfEpoch(EndOfEpochTransaction), } @@ -59,8 +59,8 @@ impl TransactionBlockKind { checkpoint_viewed_at, }) } - K::AuthenticatorStateUpdate(asu) => { - T::AuthenticatorState(AuthenticatorStateUpdateTransaction { + K::AuthenticatorStateUpdateV1(asu) => { + T::AuthenticatorState(AuthenticatorStateUpdateV1Transaction { native: asu, checkpoint_viewed_at, }) diff --git a/crates/iota-json-rpc-types/src/iota_transaction.rs b/crates/iota-json-rpc-types/src/iota_transaction.rs index b02d0a3eacf..b20a01f4836 100644 --- a/crates/iota-json-rpc-types/src/iota_transaction.rs +++ b/crates/iota-json-rpc-types/src/iota_transaction.rs @@ -417,7 +417,7 @@ pub enum IotaTransactionBlockKind { /// used in future transactions ProgrammableTransaction(IotaProgrammableTransactionBlock), /// A transaction which updates global authenticator state - AuthenticatorStateUpdate(IotaAuthenticatorStateUpdate), + AuthenticatorStateUpdateV1(IotaAuthenticatorStateUpdateV1), /// A transaction which updates global randomness state RandomnessStateUpdate(IotaRandomnessStateUpdate), /// The transaction which occurs only at the end of the epoch @@ -456,7 +456,7 @@ impl Display for IotaTransactionBlockKind { write!(writer, "Transaction Kind: Programmable")?; write!(writer, "{}", crate::displays::Pretty(p))?; } - Self::AuthenticatorStateUpdate(_) => { + Self::AuthenticatorStateUpdateV1(_) => { writeln!(writer, "Transaction Kind: Authenticator State Update")?; } Self::RandomnessStateUpdate(_) => { @@ -501,8 +501,8 @@ impl IotaTransactionBlockKind { TransactionKind::ProgrammableTransaction(p) => Self::ProgrammableTransaction( IotaProgrammableTransactionBlock::try_from(p, module_cache)?, ), - TransactionKind::AuthenticatorStateUpdate(update) => { - Self::AuthenticatorStateUpdate(IotaAuthenticatorStateUpdate { + TransactionKind::AuthenticatorStateUpdateV1(update) => { + Self::AuthenticatorStateUpdateV1(IotaAuthenticatorStateUpdateV1 { epoch: update.epoch, round: update.round, new_active_jwks: update @@ -591,8 +591,8 @@ impl IotaTransactionBlockKind { ) .await?, ), - TransactionKind::AuthenticatorStateUpdate(update) => { - Self::AuthenticatorStateUpdate(IotaAuthenticatorStateUpdate { + TransactionKind::AuthenticatorStateUpdateV1(update) => { + Self::AuthenticatorStateUpdateV1(IotaAuthenticatorStateUpdateV1 { epoch: update.epoch, round: update.round, new_active_jwks: update @@ -658,7 +658,7 @@ impl IotaTransactionBlockKind { Self::Genesis(_) => "Genesis", Self::ConsensusCommitPrologueV1(_) => "ConsensusCommitPrologueV1", Self::ProgrammableTransaction(_) => "ProgrammableTransaction", - Self::AuthenticatorStateUpdate(_) => "AuthenticatorStateUpdate", + Self::AuthenticatorStateUpdateV1(_) => "AuthenticatorStateUpdateV1", Self::RandomnessStateUpdate(_) => "RandomnessStateUpdate", Self::EndOfEpochTransaction(_) => "EndOfEpochTransaction", } @@ -1604,7 +1604,7 @@ pub struct IotaConsensusCommitPrologueV1 { #[serde_as] #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq, Eq)] -pub struct IotaAuthenticatorStateUpdate { +pub struct IotaAuthenticatorStateUpdateV1 { #[schemars(with = "BigInt")] #[serde_as(as = "BigInt")] pub epoch: u64, diff --git a/crates/iota-rosetta/src/types.rs b/crates/iota-rosetta/src/types.rs index 99ebb1738bb..baf164efc3c 100644 --- a/crates/iota-rosetta/src/types.rs +++ b/crates/iota-rosetta/src/types.rs @@ -416,7 +416,7 @@ pub enum OperationType { Genesis, ConsensusCommitPrologue, ProgrammableTransaction, - AuthenticatorStateUpdate, + AuthenticatorStateUpdateV1, RandomnessStateUpdate, EndOfEpochTransaction, } @@ -432,8 +432,8 @@ impl From<&IotaTransactionBlockKind> for OperationType { IotaTransactionBlockKind::ProgrammableTransaction(_) => { OperationType::ProgrammableTransaction } - IotaTransactionBlockKind::AuthenticatorStateUpdate(_) => { - OperationType::AuthenticatorStateUpdate + IotaTransactionBlockKind::AuthenticatorStateUpdateV1(_) => { + OperationType::AuthenticatorStateUpdateV1 } IotaTransactionBlockKind::RandomnessStateUpdate(_) => { OperationType::RandomnessStateUpdate diff --git a/crates/iota-types/src/transaction.rs b/crates/iota-types/src/transaction.rs index f4a561210d5..51c3db96e56 100644 --- a/crates/iota-types/src/transaction.rs +++ b/crates/iota-types/src/transaction.rs @@ -228,7 +228,7 @@ impl AuthenticatorStateExpire { } #[derive(Debug, Hash, PartialEq, Eq, Clone, Serialize, Deserialize)] -pub struct AuthenticatorStateUpdate { +pub struct AuthenticatorStateUpdateV1 { /// Epoch of the authenticator state update transaction pub epoch: u64, /// Consensus round of the authenticator state update @@ -241,7 +241,7 @@ pub struct AuthenticatorStateUpdate { // TransactionKind. } -impl AuthenticatorStateUpdate { +impl AuthenticatorStateUpdateV1 { pub fn authenticator_obj_initial_shared_version(&self) -> SequenceNumber { self.authenticator_obj_initial_shared_version } @@ -286,7 +286,7 @@ pub enum TransactionKind { ChangeEpoch(ChangeEpoch), Genesis(GenesisTransaction), ConsensusCommitPrologueV1(ConsensusCommitPrologueV1), - AuthenticatorStateUpdate(AuthenticatorStateUpdate), + AuthenticatorStateUpdateV1(AuthenticatorStateUpdateV1), /// EndOfEpochTransaction replaces ChangeEpoch with a list of transactions /// that are allowed to run at the end of the epoch. @@ -1151,7 +1151,7 @@ impl TransactionKind { TransactionKind::ChangeEpoch(_) | TransactionKind::Genesis(_) | TransactionKind::ConsensusCommitPrologueV1(_) - | TransactionKind::AuthenticatorStateUpdate(_) + | TransactionKind::AuthenticatorStateUpdateV1(_) | TransactionKind::RandomnessStateUpdate(_) | TransactionKind::EndOfEpochTransaction(_) => true, TransactionKind::ProgrammableTransaction(_) => false, @@ -1206,7 +1206,7 @@ impl TransactionKind { mutable: true, }))) } - Self::AuthenticatorStateUpdate(update) => { + Self::AuthenticatorStateUpdateV1(update) => { Either::Left(Either::Left(iter::once(SharedInputObject { id: IOTA_AUTHENTICATOR_STATE_OBJECT_ID, initial_shared_version: update.authenticator_obj_initial_shared_version, @@ -1242,7 +1242,7 @@ impl TransactionKind { TransactionKind::ChangeEpoch(_) | TransactionKind::Genesis(_) | TransactionKind::ConsensusCommitPrologueV1(_) - | TransactionKind::AuthenticatorStateUpdate(_) + | TransactionKind::AuthenticatorStateUpdateV1(_) | TransactionKind::RandomnessStateUpdate(_) | TransactionKind::EndOfEpochTransaction(_) => vec![], TransactionKind::ProgrammableTransaction(pt) => pt.receiving_objects(), @@ -1273,7 +1273,7 @@ impl TransactionKind { mutable: true, }] } - Self::AuthenticatorStateUpdate(update) => { + Self::AuthenticatorStateUpdateV1(update) => { vec![InputObjectKind::SharedMoveObject { id: IOTA_AUTHENTICATOR_STATE_OBJECT_ID, initial_shared_version: update.authenticator_obj_initial_shared_version(), @@ -1331,7 +1331,7 @@ impl TransactionKind { } } - TransactionKind::AuthenticatorStateUpdate(_) => { + TransactionKind::AuthenticatorStateUpdateV1(_) => { if !config.enable_jwk_consensus_updates() { return Err(UserInputError::Unsupported( "authenticator state updates not enabled".to_string(), @@ -1372,7 +1372,7 @@ impl TransactionKind { Self::Genesis(_) => "Genesis", Self::ConsensusCommitPrologueV1(_) => "ConsensusCommitPrologueV1", Self::ProgrammableTransaction(_) => "ProgrammableTransaction", - Self::AuthenticatorStateUpdate(_) => "AuthenticatorStateUpdate", + Self::AuthenticatorStateUpdateV1(_) => "AuthenticatorStateUpdateV1", Self::RandomnessStateUpdate(_) => "RandomnessStateUpdate", Self::EndOfEpochTransaction(_) => "EndOfEpochTransaction", } @@ -1408,7 +1408,7 @@ impl Display for TransactionKind { writeln!(writer, "Transaction Kind : Programmable")?; write!(writer, "{p}")?; } - Self::AuthenticatorStateUpdate(_) => { + Self::AuthenticatorStateUpdateV1(_) => { writeln!(writer, "Transaction Kind : Authenticator State Update")?; } Self::RandomnessStateUpdate(_) => { @@ -2469,13 +2469,13 @@ impl VerifiedTransaction { new_active_jwks: Vec, authenticator_obj_initial_shared_version: SequenceNumber, ) -> Self { - AuthenticatorStateUpdate { + AuthenticatorStateUpdateV1 { epoch, round, new_active_jwks, authenticator_obj_initial_shared_version, } - .pipe(TransactionKind::AuthenticatorStateUpdate) + .pipe(TransactionKind::AuthenticatorStateUpdateV1) .pipe(Self::new_system_transaction) } diff --git a/crates/test-cluster/src/lib.rs b/crates/test-cluster/src/lib.rs index 20b868fb032..35c385b9133 100644 --- a/crates/test-cluster/src/lib.rs +++ b/crates/test-cluster/src/lib.rs @@ -612,7 +612,7 @@ impl TestCluster { .unwrap(); match &tx.data().intent_message().value.kind() { TransactionKind::EndOfEpochTransaction(_) => (), - TransactionKind::AuthenticatorStateUpdate(_) => break, + TransactionKind::AuthenticatorStateUpdateV1(_) => break, _ => panic!("{:?}", tx), } } diff --git a/iota-execution/latest/iota-adapter/src/execution_engine.rs b/iota-execution/latest/iota-adapter/src/execution_engine.rs index 5eb568435c8..de086285107 100644 --- a/iota-execution/latest/iota-adapter/src/execution_engine.rs +++ b/iota-execution/latest/iota-adapter/src/execution_engine.rs @@ -56,7 +56,7 @@ mod checked { randomness_state::{RANDOMNESS_MODULE_NAME, RANDOMNESS_STATE_UPDATE_FUNCTION_NAME}, storage::{BackingStore, Storage}, transaction::{ - Argument, AuthenticatorStateExpire, AuthenticatorStateUpdate, CallArg, ChangeEpoch, + Argument, AuthenticatorStateExpire, AuthenticatorStateUpdateV1, CallArg, ChangeEpoch, CheckedInputObjects, Command, EndOfEpochTransactionKind, GenesisTransaction, ObjectArg, ProgrammableTransaction, RandomnessStateUpdate, TransactionKind, }, @@ -721,7 +721,7 @@ mod checked { "EndOfEpochTransactionKind::ChangeEpoch should be the last transaction in the list" ) } - TransactionKind::AuthenticatorStateUpdate(auth_state_update) => { + TransactionKind::AuthenticatorStateUpdateV1(auth_state_update) => { setup_authenticator_state_update( auth_state_update, temporary_store, @@ -1136,7 +1136,7 @@ mod checked { /// arguments. It then executes the transaction using the system /// execution mode. fn setup_authenticator_state_update( - update: AuthenticatorStateUpdate, + update: AuthenticatorStateUpdateV1, temporary_store: &mut TemporaryStore<'_>, tx_ctx: &mut TxContext, move_vm: &Arc, diff --git a/iota-execution/v0/iota-adapter/src/execution_engine.rs b/iota-execution/v0/iota-adapter/src/execution_engine.rs index 3b00690a122..90e731fb228 100644 --- a/iota-execution/v0/iota-adapter/src/execution_engine.rs +++ b/iota-execution/v0/iota-adapter/src/execution_engine.rs @@ -56,7 +56,7 @@ mod checked { randomness_state::{RANDOMNESS_MODULE_NAME, RANDOMNESS_STATE_UPDATE_FUNCTION_NAME}, storage::{BackingStore, Storage}, transaction::{ - Argument, AuthenticatorStateExpire, AuthenticatorStateUpdate, CallArg, ChangeEpoch, + Argument, AuthenticatorStateExpire, AuthenticatorStateUpdateV1, CallArg, ChangeEpoch, CheckedInputObjects, Command, EndOfEpochTransactionKind, GenesisTransaction, ObjectArg, ProgrammableTransaction, RandomnessStateUpdate, TransactionKind, }, @@ -674,7 +674,7 @@ mod checked { "EndOfEpochTransactionKind::ChangeEpoch should be the last transaction in the list" ) } - TransactionKind::AuthenticatorStateUpdate(auth_state_update) => { + TransactionKind::AuthenticatorStateUpdateV1(auth_state_update) => { setup_authenticator_state_update( auth_state_update, temporary_store, @@ -1055,7 +1055,7 @@ mod checked { } fn setup_authenticator_state_update( - update: AuthenticatorStateUpdate, + update: AuthenticatorStateUpdateV1, temporary_store: &mut TemporaryStore<'_>, tx_ctx: &mut TxContext, move_vm: &Arc, From 67398fc093cdf43f326716e24eb991d7b00ea4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daria=20Dziuba=C5=82towska?= Date: Tue, 15 Oct 2024 12:45:08 +0200 Subject: [PATCH 05/62] remove(iota-core): Remove PendingCheckpoint v1 --- .../authority/authority_per_epoch_store.rs | 2 +- crates/iota-core/src/checkpoints/mod.rs | 39 ------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 235d0c4b0f4..9060daa803d 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -3690,7 +3690,7 @@ impl AuthorityPerEpochStore { // single batch. This means that upon restart we can use // BuilderCheckpointSummary::commit_height from the last built summary // to resume building checkpoints. - let mut batch = self.tables()?.pending_checkpoints.batch(); + let mut batch = self.tables()?.pending_checkpoints_v2.batch(); for (position_in_commit, (summary, transactions)) in content_info.into_iter().enumerate() { let sequence_number = summary.sequence_number; let summary = BuilderCheckpointSummary { diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs index bb407acb2d7..a379ddcfa9f 100644 --- a/crates/iota-core/src/checkpoints/mod.rs +++ b/crates/iota-core/src/checkpoints/mod.rs @@ -101,12 +101,6 @@ pub struct PendingCheckpointInfo { pub checkpoint_height: CheckpointHeight, } -#[derive(Clone, Debug, Serialize, Deserialize)] -pub struct PendingCheckpoint { - pub roots: Vec, - pub details: PendingCheckpointInfo, -} - #[derive(Clone, Debug, Serialize, Deserialize)] pub enum PendingCheckpointV2 { // This is an enum for future upgradability, though at the moment there is only one variant. @@ -132,18 +126,6 @@ impl PendingCheckpointV2 { } } - pub fn expect_v1(self) -> PendingCheckpoint { - let v2 = self.into_v2(); - PendingCheckpoint { - roots: v2 - .roots - .into_iter() - .map(|root| *root.unwrap_digest()) - .collect(), - details: v2.details, - } - } - pub fn roots(&self) -> &Vec { &self.as_v2().roots } @@ -2398,27 +2380,6 @@ impl CheckpointServiceNotify for CheckpointServiceNoop { } } -impl PendingCheckpoint { - pub fn height(&self) -> CheckpointHeight { - self.details.checkpoint_height - } -} - -impl PendingCheckpointV2 {} - -impl From for PendingCheckpointV2 { - fn from(value: PendingCheckpoint) -> Self { - PendingCheckpointV2::V2(PendingCheckpointV2Contents { - roots: value - .roots - .into_iter() - .map(TransactionKey::Digest) - .collect(), - details: value.details, - }) - } -} - #[cfg(test)] mod tests { use std::{ From ba41dafc65b59dc2d026741005f4d1cf81d638fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daria=20Dziuba=C5=82towska?= Date: Tue, 15 Oct 2024 13:18:47 +0200 Subject: [PATCH 06/62] refactor(iota-core): Rename PendingCheckpointV2 and related methods to V1 or no suffix --- .../authority/authority_per_epoch_store.rs | 20 ++++++------- crates/iota-core/src/checkpoints/mod.rs | 30 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 9060daa803d..428de9bf0c1 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -97,7 +97,7 @@ use crate::{ }, checkpoints::{ BuilderCheckpointSummary, CheckpointHeight, CheckpointServiceNotify, EpochStats, - PendingCheckpointInfo, PendingCheckpointV2, PendingCheckpointV2Contents, + PendingCheckpointInfo, PendingCheckpoint, PendingCheckpointContents, }, consensus_handler::{ ConsensusCommitInfo, SequencedConsensusTransaction, SequencedConsensusTransactionKey, @@ -514,7 +514,7 @@ pub struct AuthorityEpochTables { /// with empty content(see CheckpointBuilder::write_checkpoint), /// the sequence number of checkpoint does not match height here. #[default_options_override_fn = "pending_checkpoints_table_default_config"] - pending_checkpoints: DBMap, + pending_checkpoints: DBMap, /// Checkpoint builder maintains internal list of transactions it included /// in checkpoints here @@ -2748,7 +2748,7 @@ impl AuthorityPerEpochStore { checkpoint_roots.push(consensus_commit_prologue_root); } checkpoint_roots.extend(roots.into_iter()); - let pending_checkpoint = PendingCheckpointV2::V2(PendingCheckpointV2Contents { + let pending_checkpoint = PendingCheckpoint::V1(PendingCheckpointContents { roots: checkpoint_roots, details: PendingCheckpointInfo { timestamp_ms: consensus_commit_info.timestamp, @@ -2771,7 +2771,7 @@ impl AuthorityPerEpochStore { )); } if randomness_round.is_some() || (dkg_failed && !randomness_roots.is_empty()) { - let pending_checkpoint = PendingCheckpointV2::V2(PendingCheckpointV2Contents { + let pending_checkpoint = PendingCheckpoint::V1(PendingCheckpointContents { roots: randomness_roots.into_iter().collect(), details: PendingCheckpointInfo { timestamp_ms: consensus_commit_info.timestamp, @@ -3638,7 +3638,7 @@ impl AuthorityPerEpochStore { pub(crate) fn write_pending_checkpoint( &self, output: &mut ConsensusCommitOutput, - checkpoint: &PendingCheckpointV2, + checkpoint: &PendingCheckpoint, ) -> IotaResult { assert!( self.get_pending_checkpoint(&checkpoint.height())?.is_none(), @@ -3665,7 +3665,7 @@ impl AuthorityPerEpochStore { pub fn get_pending_checkpoints( &self, last: Option, - ) -> IotaResult> { + ) -> IotaResult> { let tables = self.tables()?; let mut iter = tables.pending_checkpoints.unbounded_iter(); if let Some(last_processed_height) = last { @@ -3677,7 +3677,7 @@ impl AuthorityPerEpochStore { pub fn get_pending_checkpoint( &self, index: &CheckpointHeight, - ) -> IotaResult> { + ) -> IotaResult> { Ok(self.tables()?.pending_checkpoints.get(index)?) } @@ -3690,7 +3690,7 @@ impl AuthorityPerEpochStore { // single batch. This means that upon restart we can use // BuilderCheckpointSummary::commit_height from the last built summary // to resume building checkpoints. - let mut batch = self.tables()?.pending_checkpoints_v2.batch(); + let mut batch = self.tables()?.pending_checkpoints.batch(); for (position_in_commit, (summary, transactions)) in content_info.into_iter().enumerate() { let sequence_number = summary.sequence_number; let summary = BuilderCheckpointSummary { @@ -3947,7 +3947,7 @@ pub(crate) struct ConsensusCommitOutput { // checkpoint state user_signatures_for_checkpoints: Vec<(TransactionDigest, Vec)>, - pending_checkpoints: Vec, + pending_checkpoints: Vec, // random beacon state next_randomness_round: Option<(RandomnessRound, TimestampMs)>, @@ -4021,7 +4021,7 @@ impl ConsensusCommitOutput { .extend(deferral_keys.iter().cloned()); } - fn insert_pending_checkpoint(&mut self, checkpoint: PendingCheckpointV2) { + fn insert_pending_checkpoint(&mut self, checkpoint: PendingCheckpoint) { self.pending_checkpoints.push(checkpoint); } diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs index a379ddcfa9f..2b8051405a9 100644 --- a/crates/iota-core/src/checkpoints/mod.rs +++ b/crates/iota-core/src/checkpoints/mod.rs @@ -102,36 +102,36 @@ pub struct PendingCheckpointInfo { } #[derive(Clone, Debug, Serialize, Deserialize)] -pub enum PendingCheckpointV2 { +pub enum PendingCheckpoint { // This is an enum for future upgradability, though at the moment there is only one variant. - V2(PendingCheckpointV2Contents), + V1(PendingCheckpointContents), } #[derive(Clone, Debug, Serialize, Deserialize)] -pub struct PendingCheckpointV2Contents { +pub struct PendingCheckpointContents { pub roots: Vec, pub details: PendingCheckpointInfo, } -impl PendingCheckpointV2 { - pub fn as_v2(&self) -> &PendingCheckpointV2Contents { +impl PendingCheckpoint { + pub fn as_v1(&self) -> &PendingCheckpointContents { match self { - PendingCheckpointV2::V2(contents) => contents, + PendingCheckpoint::V1(contents) => contents, } } - pub fn into_v2(self) -> PendingCheckpointV2Contents { + pub fn into_v1(self) -> PendingCheckpointContents { match self { - PendingCheckpointV2::V2(contents) => contents, + PendingCheckpoint::V1(contents) => contents, } } pub fn roots(&self) -> &Vec { - &self.as_v2().roots + &self.as_v1().roots } pub fn details(&self) -> &PendingCheckpointInfo { - &self.as_v2().details + &self.as_v1().details } pub fn height(&self) -> CheckpointHeight { @@ -1019,7 +1019,7 @@ impl CheckpointBuilder { } #[instrument(level = "debug", skip_all, fields(last_height = pendings.last().unwrap().details().checkpoint_height))] - async fn make_checkpoint(&self, pendings: Vec) -> anyhow::Result<()> { + async fn make_checkpoint(&self, pendings: Vec) -> anyhow::Result<()> { let last_details = pendings.last().unwrap().details().clone(); // Keeps track of the effects that are already included in the current @@ -1033,7 +1033,7 @@ impl CheckpointBuilder { // Transactions will be recorded in the checkpoint in this order. let mut sorted_tx_effects_included_in_checkpoint = Vec::new(); for pending_checkpoint in pendings.into_iter() { - let pending = pending_checkpoint.into_v2(); + let pending = pending_checkpoint.into_v1(); let txn_in_checkpoint = self .resolve_checkpoint_transactions(pending.roots, &mut effects_in_current_checkpoint) .await?; @@ -2299,7 +2299,7 @@ impl CheckpointService { fn write_and_notify_checkpoint_for_testing( &self, epoch_store: &AuthorityPerEpochStore, - checkpoint: PendingCheckpointV2, + checkpoint: PendingCheckpoint, ) -> IotaResult { use crate::authority::authority_per_epoch_store::ConsensusCommitOutput; @@ -2726,8 +2726,8 @@ mod tests { } } - fn p(i: u64, t: Vec, timestamp_ms: u64) -> PendingCheckpointV2 { - PendingCheckpointV2::V2(PendingCheckpointV2Contents { + fn p(i: u64, t: Vec, timestamp_ms: u64) -> PendingCheckpoint { + PendingCheckpoint::V1(PendingCheckpointContents { roots: t .into_iter() .map(|t| TransactionKey::Digest(d(t))) From da1c30727ffc7394f77704c392868d6f6bb14163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daria=20Dziuba=C5=82towska?= Date: Wed, 16 Oct 2024 14:14:01 +0200 Subject: [PATCH 07/62] remove(iota-core): Remove depreciated tables assigned_shared_object_versions --- crates/iota-core/src/authority/authority_per_epoch_store.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 428de9bf0c1..7040b8fb79b 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -97,7 +97,7 @@ use crate::{ }, checkpoints::{ BuilderCheckpointSummary, CheckpointHeight, CheckpointServiceNotify, EpochStats, - PendingCheckpointInfo, PendingCheckpoint, PendingCheckpointContents, + PendingCheckpoint, PendingCheckpointContents, PendingCheckpointInfo, }, consensus_handler::{ ConsensusCommitInfo, SequencedConsensusTransaction, SequencedConsensusTransactionKey, @@ -1618,7 +1618,7 @@ impl AuthorityPerEpochStore { cache_reader: &dyn ObjectCacheRead, certificates: &[VerifiedExecutableTransaction], ) -> IotaResult { - let mut db_batch = self.tables()?.assigned_shared_object_versions.batch(); + let mut db_batch = self.tables()?.assigned_shared_object_versions_v2.batch(); let assigned_versions = SharedObjVerManager::assign_versions_from_consensus( self, cache_reader, @@ -1803,7 +1803,7 @@ impl AuthorityPerEpochStore { cache_reader, ) .await?; - let mut db_batch = self.tables()?.assigned_shared_object_versions.batch(); + let mut db_batch = self.tables()?.assigned_shared_object_versions_v2.batch(); self.set_assigned_shared_object_versions_with_db_batch(versions, &mut db_batch) .await?; db_batch.write()?; From f3fd040297b8a6d4cdd23b95e2f2c0beee575d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daria=20Dziuba=C5=82towska?= Date: Wed, 16 Oct 2024 14:15:05 +0200 Subject: [PATCH 08/62] remove(iota-core): Make sure randomness_state is always enabled --- crates/iota-core/src/authority/authority_per_epoch_store.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 7040b8fb79b..8b842af2203 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -895,6 +895,12 @@ impl AuthorityPerEpochStore { randomness_manager: OnceCell::new(), randomness_reporter: OnceCell::new(), }); + + // until randomness_state_enabled is not removed we need to make sure it is + // always enabled as depreciated versions of pending_checkpoints and + // assigned_shared_object_versions has been removed + assert!(s.randomness_state_enabled()); + s.update_buffer_stake_metric(); s } From efe2dd3c793c3e1674e3f0dd92ed085fb2316ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daria=20Dziuba=C5=82towska?= Date: Wed, 16 Oct 2024 14:16:35 +0200 Subject: [PATCH 09/62] refactor(iota-core): Rename assigned_shared_object_versions_v2 to assigned_shared_object_versions --- crates/iota-core/src/authority/authority_per_epoch_store.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 8b842af2203..d1272c007e6 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -1624,7 +1624,7 @@ impl AuthorityPerEpochStore { cache_reader: &dyn ObjectCacheRead, certificates: &[VerifiedExecutableTransaction], ) -> IotaResult { - let mut db_batch = self.tables()?.assigned_shared_object_versions_v2.batch(); + let mut db_batch = self.tables()?.assigned_shared_object_versions.batch(); let assigned_versions = SharedObjVerManager::assign_versions_from_consensus( self, cache_reader, @@ -1809,7 +1809,7 @@ impl AuthorityPerEpochStore { cache_reader, ) .await?; - let mut db_batch = self.tables()?.assigned_shared_object_versions_v2.batch(); + let mut db_batch = self.tables()?.assigned_shared_object_versions.batch(); self.set_assigned_shared_object_versions_with_db_batch(versions, &mut db_batch) .await?; db_batch.write()?; From e9fe49532abc716f615fd75c0ac5d4b62aae7173 Mon Sep 17 00:00:00 2001 From: Bing-Yang <51323441+bingyanglin@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:40:20 +0800 Subject: [PATCH 10/62] refactor(core-node): Remove `StateAccumulatorV1`and rename `StateAccumulatorV2` (#3524) * Remove StateAccumulatorV1 * Remove the state_accumulator_v2 always true logic * Rename state_accumulator_v2_enabled_config to be state_accumulator_config * Set the default state_accumulator_config * Rename with_state_accumulator_v2_enabled_callback to be with_state_accumulator_callback * Rename StateAccumulatorV2 to be StateAccumulatorV1 * clippy and fmt * Remove StateAccumulatorV1Enabled* flags --- crates/iota-benchmark/tests/simtest.rs | 2 +- crates/iota-config/src/node.rs | 5 - .../authority/authority_per_epoch_store.rs | 28 +--- .../authority/epoch_start_configuration.rs | 23 +--- crates/iota-core/src/state_accumulator.rs | 122 +----------------- .../src/network_config_builder.rs | 40 ++---- .../src/node_config_builder.rs | 9 -- crates/iota-swarm/src/memory/swarm.rs | 19 +-- crates/test-cluster/src/lib.rs | 20 ++- 9 files changed, 35 insertions(+), 233 deletions(-) diff --git a/crates/iota-benchmark/tests/simtest.rs b/crates/iota-benchmark/tests/simtest.rs index 3785ce9f592..653432dfe11 100644 --- a/crates/iota-benchmark/tests/simtest.rs +++ b/crates/iota-benchmark/tests/simtest.rs @@ -111,7 +111,7 @@ mod test { ..Default::default() }) .with_submit_delay_step_override_millis(3000) - .with_state_accumulator_v2_enabled_callback(Arc::new(|idx| idx % 2 == 0)) + .with_state_accumulator_callback(Arc::new(|idx| idx % 2 == 0)) .build() .await .into(); diff --git a/crates/iota-config/src/node.rs b/crates/iota-config/src/node.rs index 0d652818528..9c14740f18f 100644 --- a/crates/iota-config/src/node.rs +++ b/crates/iota-config/src/node.rs @@ -236,11 +236,6 @@ pub struct NodeConfig { #[serde(default)] pub execution_cache: ExecutionCacheConfig, - // step 1 in removing the old state accumulator - #[serde(skip)] - #[serde(default = "bool_true")] - pub state_accumulator_v2: bool, - #[serde(default = "bool_true")] pub enable_validator_tx_finalizer: bool, } diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 235d0c4b0f4..5f1ad2d68db 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -90,7 +90,7 @@ use super::{ use crate::{ authority::{ AuthorityMetrics, ResolverWrapper, - epoch_start_configuration::{EpochFlag, EpochStartConfiguration}, + epoch_start_configuration::EpochStartConfiguration, shared_object_version_manager::{ AssignedTxAndVersions, ConsensusSharedObjVerAssignment, SharedObjVerManager, }, @@ -976,15 +976,6 @@ impl AuthorityPerEpochStore { self.parent_path.clone() } - pub fn state_accumulator_v2_enabled(&self) -> bool { - let flag = match self.get_chain_identifier().chain() { - Chain::Unknown | Chain::Testnet => EpochFlag::StateAccumulatorV2EnabledTestnet, - Chain::Mainnet => EpochFlag::StateAccumulatorV2EnabledMainnet, - }; - - self.epoch_start_configuration.flags().contains(&flag) - } - /// Returns `&Arc` /// User can treat this `Arc` as `&EpochStartConfiguration`, or clone the /// Arc to pass as owned object @@ -1364,23 +1355,6 @@ impl AuthorityPerEpochStore { .map_err(Into::into) } - /// Returns future containing the state digest for the given epoch - /// once available. - /// TODO: remove once StateAccumulatorV1 is removed - pub async fn notify_read_checkpoint_state_digests( - &self, - checkpoints: Vec, - ) -> IotaResult> { - self.checkpoint_state_notify_read - .read(&checkpoints, |checkpoints| -> IotaResult<_> { - Ok(self - .tables()? - .state_hash_by_checkpoint - .multi_get(checkpoints)?) - }) - .await - } - pub async fn notify_read_running_root( &self, checkpoint: CheckpointSequenceNumber, diff --git a/crates/iota-core/src/authority/epoch_start_configuration.rs b/crates/iota-core/src/authority/epoch_start_configuration.rs index 251c6af9934..94771c361df 100644 --- a/crates/iota-core/src/authority/epoch_start_configuration.rs +++ b/crates/iota-core/src/authority/epoch_start_configuration.rs @@ -55,26 +55,20 @@ pub trait EpochStartConfigTrait { #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)] pub enum EpochFlag { WritebackCacheEnabled = 0, - - StateAccumulatorV2EnabledTestnet = 1, - StateAccumulatorV2EnabledMainnet = 2, } impl EpochFlag { pub fn default_flags_for_new_epoch(config: &NodeConfig) -> Vec { - Self::default_flags_impl(&config.execution_cache, config.state_accumulator_v2) + Self::default_flags_impl(&config.execution_cache) } /// For situations in which there is no config available (e.g. setting up a /// downloaded snapshot). pub fn default_for_no_config() -> Vec { - Self::default_flags_impl(&Default::default(), true) + Self::default_flags_impl(&Default::default()) } - fn default_flags_impl( - cache_config: &ExecutionCacheConfig, - enable_state_accumulator_v2: bool, - ) -> Vec { + fn default_flags_impl(cache_config: &ExecutionCacheConfig) -> Vec { let mut new_flags = vec![]; if matches!( @@ -84,11 +78,6 @@ impl EpochFlag { new_flags.push(EpochFlag::WritebackCacheEnabled); } - if enable_state_accumulator_v2 { - new_flags.push(EpochFlag::StateAccumulatorV2EnabledTestnet); - new_flags.push(EpochFlag::StateAccumulatorV2EnabledMainnet); - } - new_flags } } @@ -99,12 +88,6 @@ impl fmt::Display for EpochFlag { // is used as metric key match self { EpochFlag::WritebackCacheEnabled => write!(f, "WritebackCacheEnabled"), - EpochFlag::StateAccumulatorV2EnabledTestnet => { - write!(f, "StateAccumulatorV2EnabledTestnet") - } - EpochFlag::StateAccumulatorV2EnabledMainnet => { - write!(f, "StateAccumulatorV2EnabledMainnet") - } } } } diff --git a/crates/iota-core/src/state_accumulator.rs b/crates/iota-core/src/state_accumulator.rs index 3f862291682..3fa9aaad7c9 100644 --- a/crates/iota-core/src/state_accumulator.rs +++ b/crates/iota-core/src/state_accumulator.rs @@ -45,7 +45,6 @@ impl StateAccumulatorMetrics { pub enum StateAccumulator { V1(StateAccumulatorV1), - V2(StateAccumulatorV2), } pub struct StateAccumulatorV1 { @@ -53,11 +52,6 @@ pub struct StateAccumulatorV1 { metrics: Arc, } -pub struct StateAccumulatorV2 { - store: Arc, - metrics: Arc, -} - pub trait AccumulatorStore: ObjectStore + Send + Sync { fn get_root_state_accumulator_for_epoch( &self, @@ -166,11 +160,7 @@ impl StateAccumulator { epoch_store: &Arc, metrics: Arc, ) -> Self { - if epoch_store.state_accumulator_v2_enabled() { - StateAccumulator::V2(StateAccumulatorV2::new(store, metrics)) - } else { - StateAccumulator::V1(StateAccumulatorV1::new(store, metrics)) - } + StateAccumulator::V1(StateAccumulatorV1::new(store, metrics)) } pub fn new_for_tests( @@ -187,14 +177,12 @@ impl StateAccumulator { pub fn metrics(&self) -> Arc { match self { StateAccumulator::V1(impl_v1) => impl_v1.metrics.clone(), - StateAccumulator::V2(impl_v2) => impl_v2.metrics.clone(), } } pub fn set_inconsistent_state(&self, is_inconsistent_state: bool) { match self { StateAccumulator::V1(impl_v1) => &impl_v1.metrics, - StateAccumulator::V2(impl_v2) => &impl_v2.metrics, } .inconsistent_state .set(is_inconsistent_state as i64); @@ -232,12 +220,8 @@ impl StateAccumulator { checkpoint_acc: Option, ) -> IotaResult { match self { - StateAccumulator::V1(_) => { - // V1 does not have a running root accumulator - Ok(()) - } - StateAccumulator::V2(impl_v2) => { - impl_v2 + StateAccumulator::V1(impl_v1) => { + impl_v1 .accumulate_running_root(epoch_store, checkpoint_seq_num, checkpoint_acc) .await } @@ -251,12 +235,7 @@ impl StateAccumulator { ) -> IotaResult { match self { StateAccumulator::V1(impl_v1) => { - impl_v1 - .accumulate_epoch(epoch_store, last_checkpoint_of_epoch) - .await - } - StateAccumulator::V2(impl_v2) => { - impl_v2.accumulate_epoch(epoch_store, last_checkpoint_of_epoch) + impl_v1.accumulate_epoch(epoch_store, last_checkpoint_of_epoch) } } } @@ -266,9 +245,6 @@ impl StateAccumulator { StateAccumulator::V1(impl_v1) => Self::accumulate_live_object_set_impl( impl_v1.store.iter_cached_live_object_set_for_testing(), ), - StateAccumulator::V2(impl_v2) => Self::accumulate_live_object_set_impl( - impl_v2.store.iter_cached_live_object_set_for_testing(), - ), } } @@ -279,9 +255,6 @@ impl StateAccumulator { StateAccumulator::V1(impl_v1) => { Self::accumulate_live_object_set_impl(impl_v1.store.iter_live_object_set()) } - StateAccumulator::V2(impl_v2) => { - Self::accumulate_live_object_set_impl(impl_v2.store.iter_live_object_set()) - } } } @@ -290,7 +263,6 @@ impl StateAccumulator { pub fn accumulate_effects(&self, effects: Vec) -> Accumulator { match self { StateAccumulator::V1(impl_v1) => impl_v1.accumulate_effects(effects), - StateAccumulator::V2(impl_v2) => impl_v2.accumulate_effects(effects), } } @@ -339,92 +311,6 @@ impl StateAccumulatorV1 { Self { store, metrics } } - /// Unions all checkpoint accumulators at the end of the epoch to generate - /// the root state hash and persists it to db. This function is - /// idempotent. Can be called on non-consecutive epochs, e.g. to - /// accumulate epoch 3 after having last accumulated epoch 1. - pub async fn accumulate_epoch( - &self, - epoch_store: Arc, - last_checkpoint_of_epoch: CheckpointSequenceNumber, - ) -> IotaResult { - let _scope = monitored_scope("AccumulateEpochV1"); - let epoch = epoch_store.epoch(); - if let Some((_checkpoint, acc)) = self.store.get_root_state_accumulator_for_epoch(epoch)? { - return Ok(acc); - } - - // Get the next checkpoint to accumulate (first checkpoint of the epoch) - // by adding 1 to the highest checkpoint of the previous epoch - let (_highest_epoch, (next_to_accumulate, mut root_state_accumulator)) = self - .store - .get_root_state_accumulator_for_highest_epoch()? - .map(|(epoch, (checkpoint, acc))| { - ( - epoch, - ( - checkpoint - .checked_add(1) - .expect("Overflowed u64 for epoch ID"), - acc, - ), - ) - }) - .unwrap_or((0, (0, Accumulator::default()))); - - debug!( - "Accumulating epoch {} from checkpoint {} to checkpoint {} (inclusive)", - epoch, next_to_accumulate, last_checkpoint_of_epoch - ); - - let (checkpoints, mut accumulators) = epoch_store - .get_accumulators_in_checkpoint_range(next_to_accumulate, last_checkpoint_of_epoch)? - .into_iter() - .unzip::<_, _, Vec<_>, Vec<_>>(); - - let remaining_checkpoints: Vec<_> = (next_to_accumulate..=last_checkpoint_of_epoch) - .filter(|seq_num| !checkpoints.contains(seq_num)) - .collect(); - - if !remaining_checkpoints.is_empty() { - debug!( - "Awaiting accumulation of checkpoints {:?} for epoch {} accumulation", - remaining_checkpoints, epoch - ); - } - - let mut remaining_accumulators = epoch_store - .notify_read_checkpoint_state_digests(remaining_checkpoints) - .await - .expect("Failed to notify read checkpoint state digests"); - - accumulators.append(&mut remaining_accumulators); - - assert!(accumulators.len() == (last_checkpoint_of_epoch - next_to_accumulate + 1) as usize); - - for acc in accumulators { - root_state_accumulator.union(&acc); - } - - self.store.insert_state_accumulator_for_epoch( - epoch, - &last_checkpoint_of_epoch, - &root_state_accumulator, - )?; - - Ok(root_state_accumulator) - } - - pub fn accumulate_effects(&self, effects: Vec) -> Accumulator { - accumulate_effects(effects) - } -} - -impl StateAccumulatorV2 { - pub fn new(store: Arc, metrics: Arc) -> Self { - Self { store, metrics } - } - pub async fn accumulate_running_root( &self, epoch_store: &AuthorityPerEpochStore, diff --git a/crates/iota-swarm-config/src/network_config_builder.rs b/crates/iota-swarm-config/src/network_config_builder.rs index 001ce83e81a..aa51ebdfb50 100644 --- a/crates/iota-swarm-config/src/network_config_builder.rs +++ b/crates/iota-swarm-config/src/network_config_builder.rs @@ -68,12 +68,12 @@ pub enum ProtocolVersionsConfig { PerValidator(SupportedProtocolVersionsCallback), } -pub type StateAccumulatorV2EnabledCallback = Arc bool + Send + Sync + 'static>; +pub type StateAccumulatorV1EnabledCallback = Arc bool + Send + Sync + 'static>; #[derive(Clone)] -pub enum StateAccumulatorV2EnabledConfig { +pub enum StateAccumulatorV1EnabledConfig { Global(bool), - PerValidator(StateAccumulatorV2EnabledCallback), + PerValidator(StateAccumulatorV1EnabledCallback), } pub struct ConfigBuilder { @@ -92,7 +92,7 @@ pub struct ConfigBuilder { firewall_config: Option, max_submit_position: Option, submit_delay_step_override_millis: Option, - state_accumulator_v2_enabled_config: Option, + state_accumulator_config: Option, empty_validator_genesis: bool, } @@ -114,7 +114,7 @@ impl ConfigBuilder { firewall_config: None, max_submit_position: None, submit_delay_step_override_millis: None, - state_accumulator_v2_enabled_config: None, + state_accumulator_config: Some(StateAccumulatorV1EnabledConfig::Global(true)), empty_validator_genesis: false, } } @@ -236,26 +236,16 @@ impl ConfigBuilder { self } - pub fn with_state_accumulator_v2_enabled(mut self, enabled: bool) -> Self { - self.state_accumulator_v2_enabled_config = - Some(StateAccumulatorV2EnabledConfig::Global(enabled)); - self - } - - pub fn with_state_accumulator_v2_enabled_callback( + pub fn with_state_accumulator_callback( mut self, - func: StateAccumulatorV2EnabledCallback, + func: StateAccumulatorV1EnabledCallback, ) -> Self { - self.state_accumulator_v2_enabled_config = - Some(StateAccumulatorV2EnabledConfig::PerValidator(func)); + self.state_accumulator_config = Some(StateAccumulatorV1EnabledConfig::PerValidator(func)); self } - pub fn with_state_accumulator_v2_enabled_config( - mut self, - c: StateAccumulatorV2EnabledConfig, - ) -> Self { - self.state_accumulator_v2_enabled_config = Some(c); + pub fn with_state_accumulator_config(mut self, c: StateAccumulatorV1EnabledConfig) -> Self { + self.state_accumulator_config = Some(c); self } @@ -304,7 +294,7 @@ impl ConfigBuilder { firewall_config: self.firewall_config, max_submit_position: self.max_submit_position, submit_delay_step_override_millis: self.submit_delay_step_override_millis, - state_accumulator_v2_enabled_config: self.state_accumulator_v2_enabled_config, + state_accumulator_config: self.state_accumulator_config, empty_validator_genesis: self.empty_validator_genesis, } } @@ -525,14 +515,6 @@ impl ConfigBuilder { }; builder = builder.with_supported_protocol_versions(supported_versions); } - if let Some(acc_v2_config) = &self.state_accumulator_v2_enabled_config { - let state_accumulator_v2_enabled: bool = match acc_v2_config { - StateAccumulatorV2EnabledConfig::Global(enabled) => *enabled, - StateAccumulatorV2EnabledConfig::PerValidator(func) => func(idx), - }; - builder = - builder.with_state_accumulator_v2_enabled(state_accumulator_v2_enabled); - } if let Some(num_unpruned_validators) = self.num_unpruned_validators { if idx < num_unpruned_validators { builder = builder.with_unpruned_checkpoints(); diff --git a/crates/iota-swarm-config/src/node_config_builder.rs b/crates/iota-swarm-config/src/node_config_builder.rs index e3109db002d..ae2a7d488f1 100644 --- a/crates/iota-swarm-config/src/node_config_builder.rs +++ b/crates/iota-swarm-config/src/node_config_builder.rs @@ -47,13 +47,11 @@ pub struct ValidatorConfigBuilder { firewall_config: Option, max_submit_position: Option, submit_delay_step_override_millis: Option, - state_accumulator_v2: bool, } impl ValidatorConfigBuilder { pub fn new() -> Self { Self { - state_accumulator_v2: true, ..Default::default() } } @@ -116,11 +114,6 @@ impl ValidatorConfigBuilder { self } - pub fn with_state_accumulator_v2_enabled(mut self, enabled: bool) -> Self { - self.state_accumulator_v2 = enabled; - self - } - pub fn build_without_genesis(self, validator: ValidatorGenesisConfig) -> NodeConfig { let key_path = get_key_path(&validator.key_pair); let config_directory = self @@ -226,7 +219,6 @@ impl ValidatorConfigBuilder { policy_config: self.policy_config, firewall_config: self.firewall_config, execution_cache: ExecutionCacheConfig::default(), - state_accumulator_v2: self.state_accumulator_v2, enable_validator_tx_finalizer: true, } } @@ -515,7 +507,6 @@ impl FullnodeConfigBuilder { policy_config: self.policy_config, firewall_config: self.fw_config, execution_cache: ExecutionCacheConfig::default(), - state_accumulator_v2: true, // This is a validator specific feature. enable_validator_tx_finalizer: false, } diff --git a/crates/iota-swarm/src/memory/swarm.rs b/crates/iota-swarm/src/memory/swarm.rs index 858d92e7e83..adf08d93581 100644 --- a/crates/iota-swarm/src/memory/swarm.rs +++ b/crates/iota-swarm/src/memory/swarm.rs @@ -24,7 +24,7 @@ use iota_swarm_config::{ genesis_config::{AccountConfig, GenesisConfig, ValidatorGenesisConfig}, network_config::NetworkConfig, network_config_builder::{ - CommitteeConfig, ConfigBuilder, ProtocolVersionsConfig, StateAccumulatorV2EnabledConfig, + CommitteeConfig, ConfigBuilder, ProtocolVersionsConfig, StateAccumulatorV1EnabledConfig, SupportedProtocolVersionsCallback, }, node_config_builder::FullnodeConfigBuilder, @@ -65,7 +65,7 @@ pub struct SwarmBuilder { fullnode_fw_config: Option, max_submit_position: Option, submit_delay_step_override_millis: Option, - state_accumulator_v2_enabled_config: StateAccumulatorV2EnabledConfig, + state_accumulator_config: StateAccumulatorV1EnabledConfig, } impl SwarmBuilder { @@ -93,7 +93,7 @@ impl SwarmBuilder { fullnode_fw_config: None, max_submit_position: None, submit_delay_step_override_millis: None, - state_accumulator_v2_enabled_config: StateAccumulatorV2EnabledConfig::Global(true), + state_accumulator_config: StateAccumulatorV1EnabledConfig::Global(true), } } } @@ -123,7 +123,7 @@ impl SwarmBuilder { fullnode_fw_config: self.fullnode_fw_config, max_submit_position: self.max_submit_position, submit_delay_step_override_millis: self.submit_delay_step_override_millis, - state_accumulator_v2_enabled_config: self.state_accumulator_v2_enabled_config, + state_accumulator_config: self.state_accumulator_config, } } @@ -234,11 +234,8 @@ impl SwarmBuilder { self } - pub fn with_state_accumulator_v2_enabled_config( - mut self, - c: StateAccumulatorV2EnabledConfig, - ) -> Self { - self.state_accumulator_v2_enabled_config = c; + pub fn with_state_accumulator_config(mut self, c: StateAccumulatorV1EnabledConfig) -> Self { + self.state_accumulator_config = c; self } @@ -362,9 +359,7 @@ impl SwarmBuilder { .with_supported_protocol_versions_config( self.supported_protocol_versions_config.clone(), ) - .with_state_accumulator_v2_enabled_config( - self.state_accumulator_v2_enabled_config.clone(), - ) + .with_state_accumulator_config(self.state_accumulator_config.clone()) .build(); // Populate validator genesis by pointing to the blob let genesis_path = dir.join(IOTA_GENESIS_FILENAME); diff --git a/crates/test-cluster/src/lib.rs b/crates/test-cluster/src/lib.rs index 35c385b9133..28b121169e0 100644 --- a/crates/test-cluster/src/lib.rs +++ b/crates/test-cluster/src/lib.rs @@ -56,7 +56,7 @@ use iota_swarm_config::{ genesis_config::{AccountConfig, DEFAULT_GAS_AMOUNT, GenesisConfig, ValidatorGenesisConfig}, network_config::{NetworkConfig, NetworkConfigLight}, network_config_builder::{ - ProtocolVersionsConfig, StateAccumulatorV2EnabledCallback, StateAccumulatorV2EnabledConfig, + ProtocolVersionsConfig, StateAccumulatorV1EnabledCallback, StateAccumulatorV1EnabledConfig, SupportedProtocolVersionsCallback, }, node_config_builder::{FullnodeConfigBuilder, ValidatorConfigBuilder}, @@ -1039,7 +1039,7 @@ pub struct TestClusterBuilder { max_submit_position: Option, submit_delay_step_override_millis: Option, - validator_state_accumulator_v2_enabled_config: StateAccumulatorV2EnabledConfig, + validator_state_accumulator_config: StateAccumulatorV1EnabledConfig, } impl TestClusterBuilder { @@ -1067,9 +1067,7 @@ impl TestClusterBuilder { fullnode_fw_config: None, max_submit_position: None, submit_delay_step_override_millis: None, - validator_state_accumulator_v2_enabled_config: StateAccumulatorV2EnabledConfig::Global( - true, - ), + validator_state_accumulator_config: StateAccumulatorV1EnabledConfig::Global(true), } } @@ -1190,12 +1188,12 @@ impl TestClusterBuilder { self } - pub fn with_state_accumulator_v2_enabled_callback( + pub fn with_state_accumulator_callback( mut self, - func: StateAccumulatorV2EnabledCallback, + func: StateAccumulatorV1EnabledCallback, ) -> Self { - self.validator_state_accumulator_v2_enabled_config = - StateAccumulatorV2EnabledConfig::PerValidator(func); + self.validator_state_accumulator_config = + StateAccumulatorV1EnabledConfig::PerValidator(func); self } @@ -1519,9 +1517,7 @@ impl TestClusterBuilder { .with_supported_protocol_versions_config( self.validator_supported_protocol_versions_config.clone(), ) - .with_state_accumulator_v2_enabled_config( - self.validator_state_accumulator_v2_enabled_config.clone(), - ) + .with_state_accumulator_config(self.validator_state_accumulator_config.clone()) .with_fullnode_count(1) .with_fullnode_supported_protocol_versions_config( self.fullnode_supported_protocol_versions_config From e351733cf192dc99f4eca0fe5e596335d395f1fc Mon Sep 17 00:00:00 2001 From: Bing-Yang <51323441+bingyanglin@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:42:54 +0800 Subject: [PATCH 11/62] refactor(narwhal-types): Clean narwhal type versioning (#3284) * Clean narwhal type versioning * Fix Batch::V2 to Batch::V1 in test --- crates/iota-protocol-config/src/lib.rs | 1 - narwhal/types/src/primary.rs | 78 +++++++++++++------------- narwhal/types/src/tests/batch_serde.rs | 8 +-- 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/crates/iota-protocol-config/src/lib.rs b/crates/iota-protocol-config/src/lib.rs index c40c06efed1..4cfba7f007a 100644 --- a/crates/iota-protocol-config/src/lib.rs +++ b/crates/iota-protocol-config/src/lib.rs @@ -1693,7 +1693,6 @@ impl ProtocolConfig { cfg.feature_flags .advance_to_highest_supported_protocol_version = true; cfg.feature_flags.consensus_transaction_ordering = ConsensusTransactionOrdering::ByGasPrice; - cfg.feature_flags.recompute_has_public_transfer_in_execution = true; cfg.feature_flags.shared_object_deletion = true; cfg.feature_flags.hardened_otw_check = true; diff --git a/narwhal/types/src/primary.rs b/narwhal/types/src/primary.rs index 650d8e0f41c..7208a3b9057 100644 --- a/narwhal/types/src/primary.rs +++ b/narwhal/types/src/primary.rs @@ -152,17 +152,17 @@ impl MetadataAPI for MetadataV1 { #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Arbitrary)] #[enum_dispatch(BatchAPI)] pub enum Batch { - V2(BatchV2), + V1(BatchV1), } impl Batch { pub fn new(transactions: Vec) -> Self { - Self::V2(BatchV2::new(transactions)) + Self::V1(BatchV1::new(transactions)) } pub fn size(&self) -> usize { match self { - Batch::V2(data) => data.size(), + Batch::V1(data) => data.size(), } } } @@ -172,7 +172,7 @@ impl Hash<{ crypto::DIGEST_LENGTH }> for Batch { fn digest(&self) -> BatchDigest { match self { - Batch::V2(data) => data.digest(), + Batch::V1(data) => data.digest(), } } } @@ -183,7 +183,7 @@ pub trait BatchAPI { fn transactions_mut(&mut self) -> &mut Vec; fn into_transactions(self) -> Vec; - // BatchV2 APIs + // BatchV1 APIs fn versioned_metadata(&self) -> &VersionedMetadata; fn versioned_metadata_mut(&mut self) -> &mut VersionedMetadata; } @@ -191,13 +191,13 @@ pub trait BatchAPI { pub type Transaction = Vec; #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Arbitrary)] -pub struct BatchV2 { +pub struct BatchV1 { pub transactions: Vec, // This field is not included as part of the batch digest pub versioned_metadata: VersionedMetadata, } -impl BatchAPI for BatchV2 { +impl BatchAPI for BatchV1 { fn transactions(&self) -> &Vec { &self.transactions } @@ -219,7 +219,7 @@ impl BatchAPI for BatchV2 { } } -impl BatchV2 { +impl BatchV1 { pub fn new(transactions: Vec) -> Self { Self { transactions, @@ -288,7 +288,7 @@ impl BatchDigest { } } -impl Hash<{ crypto::DIGEST_LENGTH }> for BatchV2 { +impl Hash<{ crypto::DIGEST_LENGTH }> for BatchV1 { type TypedDigest = BatchDigest; fn digest(&self) -> Self::TypedDigest { @@ -789,14 +789,14 @@ impl PartialEq for Vote { #[derive(Clone, Serialize, Deserialize, MallocSizeOf)] #[enum_dispatch(CertificateAPI)] pub enum Certificate { - V2(CertificateV2), + V1(CertificateV1), } impl Certificate { pub fn genesis(committee: &Committee) -> Vec { - CertificateV2::genesis(committee) + CertificateV1::genesis(committee) .into_iter() - .map(Self::V2) + .map(Self::V1) .collect() } @@ -805,7 +805,7 @@ impl Certificate { header: Header, votes: Vec<(AuthorityIdentifier, Signature)>, ) -> DagResult { - CertificateV2::new_unverified(committee, header, votes) + CertificateV1::new_unverified(committee, header, votes) } pub fn new_unsigned( @@ -813,20 +813,20 @@ impl Certificate { header: Header, votes: Vec<(AuthorityIdentifier, Signature)>, ) -> DagResult { - CertificateV2::new_unsigned(committee, header, votes) + CertificateV1::new_unsigned(committee, header, votes) } /// This function requires that certificate was verified against given /// committee pub fn signed_authorities(&self, committee: &Committee) -> Vec { match self { - Self::V2(certificate) => certificate.signed_authorities(committee), + Self::V1(certificate) => certificate.signed_authorities(committee), } } pub fn signed_by(&self, committee: &Committee) -> (Stake, Vec) { match self { - Self::V2(certificate) => certificate.signed_by(committee), + Self::V1(certificate) => certificate.signed_by(committee), } } @@ -836,30 +836,30 @@ impl Certificate { worker_cache: &WorkerCache, ) -> DagResult { match self { - Self::V2(certificate) => certificate.verify(committee, worker_cache), + Self::V1(certificate) => certificate.verify(committee, worker_cache), } } pub fn round(&self) -> Round { match self { - Self::V2(certificate) => certificate.round(), + Self::V1(certificate) => certificate.round(), } } pub fn epoch(&self) -> Epoch { match self { - Self::V2(certificate) => certificate.epoch(), + Self::V1(certificate) => certificate.epoch(), } } pub fn origin(&self) -> AuthorityIdentifier { match self { - Self::V2(certificate) => certificate.origin(), + Self::V1(certificate) => certificate.origin(), } } pub fn default_for_testing() -> Certificate { - Certificate::V2(CertificateV2::default()) + Certificate::V1(CertificateV1::default()) } } @@ -868,7 +868,7 @@ impl Hash<{ crypto::DIGEST_LENGTH }> for Certificate { fn digest(&self) -> CertificateDigest { match self { - Certificate::V2(data) => data.digest(), + Certificate::V1(data) => data.digest(), } } } @@ -884,7 +884,7 @@ pub trait CertificateAPI { fn update_header(&mut self, header: Header); fn header_mut(&mut self) -> &mut Header; - // CertificateV2 + // CertificateV1 fn signature_verification_state(&self) -> &SignatureVerificationState; fn set_signature_verification_state(&mut self, state: SignatureVerificationState); } @@ -922,7 +922,7 @@ impl Default for SignatureVerificationState { #[serde_as] #[derive(Clone, Serialize, Deserialize, Default, MallocSizeOf)] -pub struct CertificateV2 { +pub struct CertificateV1 { pub header: Header, pub signature_verification_state: SignatureVerificationState, #[serde_as(as = "NarwhalBitmap")] @@ -930,7 +930,7 @@ pub struct CertificateV2 { pub metadata: Metadata, } -impl CertificateAPI for CertificateV2 { +impl CertificateAPI for CertificateV1 { fn header(&self) -> &Header { &self.header } @@ -971,7 +971,7 @@ impl CertificateAPI for CertificateV2 { } } -impl CertificateV2 { +impl CertificateV1 { pub fn genesis(committee: &Committee) -> Vec { committee .authorities() @@ -1065,7 +1065,7 @@ impl CertificateV2 { SignatureVerificationState::Unverified(aggregate_signature_bytes) }; - Ok(Certificate::V2(CertificateV2 { + Ok(Certificate::V1(CertificateV1 { header, signature_verification_state, signed_authorities, @@ -1117,7 +1117,7 @@ impl CertificateV2 { // Genesis certificates are always valid. if self.round() == 0 && Self::genesis(committee).contains(&self) { - return Ok(Certificate::V2(self)); + return Ok(Certificate::V1(self)); } // Save signature verifications when the header is invalid. @@ -1139,7 +1139,7 @@ impl CertificateV2 { let aggregate_signature_bytes = match self.signature_verification_state { SignatureVerificationState::VerifiedIndirectly(_) | SignatureVerificationState::VerifiedDirectly(_) - | SignatureVerificationState::Genesis => return Ok(Certificate::V2(self)), + | SignatureVerificationState::Genesis => return Ok(Certificate::V1(self)), SignatureVerificationState::Unverified(ref bytes) => bytes, SignatureVerificationState::Unsigned(_) => { bail!(DagError::CertificateRequiresQuorum); @@ -1156,7 +1156,7 @@ impl CertificateV2 { self.signature_verification_state = SignatureVerificationState::VerifiedDirectly(aggregate_signature_bytes.clone()); - Ok(Certificate::V2(self)) + Ok(Certificate::V1(self)) } pub fn round(&self) -> Round { @@ -1173,15 +1173,15 @@ impl CertificateV2 { } // Certificate version is validated against network protocol version. If -// CertificateV2 is being used then the cert will also be marked as Unverified +// CertificateV1 is being used then the cert will also be marked as Unverified // as this certificate is assumed to be received from the network. This // SignatureVerificationState is why the modified certificate is being returned. pub fn validate_received_certificate_version( mut certificate: Certificate, ) -> anyhow::Result { match certificate { - Certificate::V2(_) => { - // CertificateV2 was received from the network so we need to mark + Certificate::V1(_) => { + // CertificateV1 was received from the network so we need to mark // certificate aggregated signature state as unverified. certificate.set_signature_verification_state(SignatureVerificationState::Unverified( certificate @@ -1251,7 +1251,7 @@ impl fmt::Display for CertificateDigest { } } -impl Hash<{ crypto::DIGEST_LENGTH }> for CertificateV2 { +impl Hash<{ crypto::DIGEST_LENGTH }> for CertificateV1 { type TypedDigest = CertificateDigest; fn digest(&self) -> CertificateDigest { @@ -1262,7 +1262,7 @@ impl Hash<{ crypto::DIGEST_LENGTH }> for CertificateV2 { impl fmt::Debug for Certificate { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> { match self { - Certificate::V2(data) => write!( + Certificate::V1(data) => write!( f, "{}: C{}({}, {}, E{})", data.digest(), @@ -1278,12 +1278,12 @@ impl fmt::Debug for Certificate { impl PartialEq for Certificate { fn eq(&self, other: &Self) -> bool { match (self, other) { - (Certificate::V2(data), Certificate::V2(other_data)) => data.eq(other_data), + (Certificate::V1(data), Certificate::V1(other_data)) => data.eq(other_data), } } } -impl PartialEq for CertificateV2 { +impl PartialEq for CertificateV1 { fn eq(&self, other: &Self) -> bool { let mut ret = self.header().digest() == other.header().digest(); ret &= self.round() == other.round(); @@ -1513,7 +1513,7 @@ mod tests { use tokio::time::sleep; - use crate::{Batch, BatchAPI, BatchV2, MetadataAPI, MetadataV1, Timestamp, VersionedMetadata}; + use crate::{Batch, BatchAPI, BatchV1, MetadataAPI, MetadataV1, Timestamp, VersionedMetadata}; #[tokio::test] async fn test_elapsed() { @@ -1537,7 +1537,7 @@ mod tests { #[test] fn test_elapsed_when_newer_than_now() { - let batch = Batch::V2(BatchV2 { + let batch = Batch::V1(BatchV1 { transactions: vec![], versioned_metadata: VersionedMetadata::V1(MetadataV1 { created_at: 2999309726980, // something in the future - Fri Jan 16 2065 05:35:26 diff --git a/narwhal/types/src/tests/batch_serde.rs b/narwhal/types/src/tests/batch_serde.rs index 7e8fb69a2cc..3529421ae9f 100644 --- a/narwhal/types/src/tests/batch_serde.rs +++ b/narwhal/types/src/tests/batch_serde.rs @@ -5,13 +5,13 @@ use serde_test::{Token, assert_tokens}; use crate::{ - Batch, BatchV2, MetadataV1, VersionedMetadata, serde::batch_serde::Token::NewtypeVariant, + Batch, BatchV1, MetadataV1, VersionedMetadata, serde::batch_serde::Token::NewtypeVariant, }; #[test] fn test_serde_batch() { let tx = || vec![1; 5]; - let batch = Batch::V2(BatchV2 { + let batch = Batch::V1(BatchV1 { transactions: (0..2).map(|_| tx()).collect(), versioned_metadata: VersionedMetadata::V1(MetadataV1 { created_at: 1666205365890, @@ -22,10 +22,10 @@ fn test_serde_batch() { assert_tokens(&batch, &[ NewtypeVariant { name: "Batch", - variant: "V2", + variant: "V1", }, Token::Struct { - name: "BatchV2", + name: "BatchV1", len: 2, }, Token::Str("transactions"), From 866ee63841f1b27307d46be4f0487ed9bd6c8a0d Mon Sep 17 00:00:00 2001 From: Bing-Yang <51323441+bingyanglin@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:44:08 +0800 Subject: [PATCH 12/62] refactor(iota-e2e-tests): Rename data types (#3309) * Clean data types related to iota-e2e-tests * Rename ExecuteTransactionRequestV1::new_v2 to be new_v1 --- crates/iota-benchmark/src/lib.rs | 2 +- crates/iota-core/src/quorum_driver/mod.rs | 18 +++++------ crates/iota-core/src/quorum_driver/tests.rs | 26 ++++++++-------- .../iota-core/src/transaction_orchestrator.rs | 30 +++++++++---------- .../iota-e2e-tests/tests/full_node_tests.rs | 8 ++--- .../tests/transaction_orchestrator_tests.rs | 22 +++++++------- .../src/transaction_execution_api.rs | 8 ++--- .../src/transactions/execution.rs | 4 +-- crates/iota-types/src/quorum_driver_types.rs | 19 +++--------- crates/iota-types/src/transaction_executor.rs | 6 ++-- 10 files changed, 66 insertions(+), 77 deletions(-) diff --git a/crates/iota-benchmark/src/lib.rs b/crates/iota-benchmark/src/lib.rs index a0f931b019c..e4845c2715e 100644 --- a/crates/iota-benchmark/src/lib.rs +++ b/crates/iota-benchmark/src/lib.rs @@ -355,7 +355,7 @@ impl ValidatorProxy for LocalValidatorAggregatorProxy { let ticket = self .qd .submit_transaction( - iota_types::quorum_driver_types::ExecuteTransactionRequestV3 { + iota_types::quorum_driver_types::ExecuteTransactionRequestV1 { transaction: tx.clone(), include_events: true, include_input_objects: false, diff --git a/crates/iota-core/src/quorum_driver/mod.rs b/crates/iota-core/src/quorum_driver/mod.rs index 896315208d7..80070a9e201 100644 --- a/crates/iota-core/src/quorum_driver/mod.rs +++ b/crates/iota-core/src/quorum_driver/mod.rs @@ -28,7 +28,7 @@ use iota_types::{ messages_grpc::HandleCertificateRequestV3, messages_safe_client::PlainTransactionInfoResponse, quorum_driver_types::{ - ExecuteTransactionRequestV3, QuorumDriverEffectsQueueResult, QuorumDriverError, + ExecuteTransactionRequestV1, QuorumDriverEffectsQueueResult, QuorumDriverError, QuorumDriverResponse, QuorumDriverResult, }, transaction::{CertifiedTransaction, Transaction}, @@ -62,7 +62,7 @@ const TX_MAX_RETRY_TIMES: u32 = 10; #[derive(Clone)] pub struct QuorumDriverTask { - pub request: ExecuteTransactionRequestV3, + pub request: ExecuteTransactionRequestV1, pub tx_cert: Option, pub retry_times: u32, pub next_retry_after: Instant, @@ -148,7 +148,7 @@ impl QuorumDriver { /// If it has, notify failure. async fn enqueue_again_maybe( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, tx_cert: Option, old_retry_times: u32, client_addr: Option, @@ -176,7 +176,7 @@ impl QuorumDriver { /// backoff duration will be at least `min_backoff_duration`. async fn backoff_and_enqueue( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, tx_cert: Option, old_retry_times: u32, client_addr: Option, @@ -252,7 +252,7 @@ where #[instrument(level = "trace", skip_all)] pub async fn submit_transaction( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, ) -> IotaResult> { let tx_digest = request.transaction.digest(); debug!(?tx_digest, "Received transaction execution request."); @@ -277,7 +277,7 @@ where #[instrument(level = "trace", skip_all)] pub async fn submit_transaction_no_ticket( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, client_addr: Option, ) -> IotaResult<()> { let tx_digest = request.transaction.digest(); @@ -691,7 +691,7 @@ where // TransactionOrchestrator pub async fn submit_transaction_no_ticket( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, client_addr: Option, ) -> IotaResult<()> { self.quorum_driver @@ -701,7 +701,7 @@ where pub async fn submit_transaction( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, ) -> IotaResult> { self.quorum_driver.submit_transaction(request).await } @@ -891,7 +891,7 @@ where fn handle_error( quorum_driver: Arc>, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, err: Option, tx_cert: Option, old_retry_times: u32, diff --git a/crates/iota-core/src/quorum_driver/tests.rs b/crates/iota-core/src/quorum_driver/tests.rs index f764526036c..5f0a5be614f 100644 --- a/crates/iota-core/src/quorum_driver/tests.rs +++ b/crates/iota-core/src/quorum_driver/tests.rs @@ -19,7 +19,7 @@ use iota_types::{ effects::TransactionEffectsAPI, object::{Object, generate_test_gas_objects}, quorum_driver_types::{ - ExecuteTransactionRequestV3, QuorumDriverError, QuorumDriverResponse, QuorumDriverResult, + ExecuteTransactionRequestV1, QuorumDriverError, QuorumDriverResponse, QuorumDriverResult, }, transaction::Transaction, }; @@ -96,7 +96,7 @@ async fn test_quorum_driver_submit_transaction() { assert_eq!(*effects_cert.data().transaction_digest(), digest); }); let ticket = quorum_driver_handler - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) .await .unwrap(); verify_ticket_response(ticket, &digest).await; @@ -130,7 +130,7 @@ async fn test_quorum_driver_submit_transaction_no_ticket() { }); quorum_driver_handler .submit_transaction_no_ticket( - ExecuteTransactionRequestV3::new_v2(tx), + ExecuteTransactionRequestV1::new_v1(tx), Some(SocketAddr::new([127, 0, 0, 1].into(), 0)), ) .await @@ -175,7 +175,7 @@ async fn test_quorum_driver_with_given_notify_read() { }); let ticket1 = notifier.register_one(&digest); let ticket2 = quorum_driver_handler - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) .await .unwrap(); verify_ticket_response(ticket1, &digest).await; @@ -212,7 +212,7 @@ async fn test_quorum_driver_update_validators_and_max_retry_times() { // This error should not happen in practice for benign validators and a working // client let ticket = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) .await .unwrap(); // We have a timeout here to make the test fail fast if fails @@ -305,7 +305,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx2 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) .await .unwrap() .await; @@ -357,7 +357,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx2 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) .await .unwrap() .await; @@ -393,7 +393,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx2_digest = *tx2.digest(); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) .await .unwrap() .await @@ -432,7 +432,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx3 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx3)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx3)) .await .unwrap() .await; @@ -481,7 +481,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { .is_ok() ); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) .await .unwrap() .await; @@ -531,7 +531,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { ); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) .await .unwrap() .await @@ -566,7 +566,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx4 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx4.clone())) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx4.clone())) .await .unwrap() .await; @@ -657,7 +657,7 @@ async fn test_quorum_driver_handling_overload_and_retry() { // Submit the transaction, and check that it shouldn't return, and the number of // retries is within 300s timeout / 30s retry after duration = 10 times. let ticket = quorum_driver_handler - .submit_transaction(ExecuteTransactionRequestV3::new_v2(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) .await .unwrap(); match timeout(Duration::from_secs(300), ticket).await { diff --git a/crates/iota-core/src/transaction_orchestrator.rs b/crates/iota-core/src/transaction_orchestrator.rs index 15e780e0f5c..c944bc6bb65 100644 --- a/crates/iota-core/src/transaction_orchestrator.rs +++ b/crates/iota-core/src/transaction_orchestrator.rs @@ -26,7 +26,7 @@ use iota_types::{ executable_transaction::VerifiedExecutableTransaction, iota_system_state::IotaSystemState, quorum_driver_types::{ - ExecuteTransactionRequestType, ExecuteTransactionRequestV3, ExecuteTransactionResponseV3, + ExecuteTransactionRequestType, ExecuteTransactionRequestV1, ExecuteTransactionResponseV1, FinalizedEffects, IsTransactionExecutedLocally, QuorumDriverEffectsQueueResult, QuorumDriverError, QuorumDriverResponse, QuorumDriverResult, }, @@ -158,10 +158,10 @@ where err)] pub async fn execute_transaction_block( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, request_type: ExecuteTransactionRequestType, client_addr: Option, - ) -> Result<(ExecuteTransactionResponseV3, IsTransactionExecutedLocally), QuorumDriverError> + ) -> Result<(ExecuteTransactionResponseV1, IsTransactionExecutedLocally), QuorumDriverError> { let epoch_store = self.validator_state.load_epoch_store_one_call_per_task(); @@ -200,7 +200,7 @@ where auxiliary_data, } = response; - let response = ExecuteTransactionResponseV3 { + let response = ExecuteTransactionResponseV1 { effects: FinalizedEffects::new_from_effects_cert(effects_cert.into()), events, input_objects, @@ -213,13 +213,13 @@ where // Utilize the handle_certificate_v3 validator api to request input/output // objects - #[instrument(name = "tx_orchestrator_execute_transaction_v3", level = "trace", skip_all, + #[instrument(name = "tx_orchestrator_execute_transaction_v1", level = "trace", skip_all, fields(tx_digest = ?request.transaction.digest()))] - pub async fn execute_transaction_v3( + pub async fn execute_transaction_v1( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, client_addr: Option, - ) -> Result { + ) -> Result { let epoch_store = self.validator_state.load_epoch_store_one_call_per_task(); let QuorumDriverResponse { @@ -233,7 +233,7 @@ where .await .map(|(_, r)| r)?; - Ok(ExecuteTransactionResponseV3 { + Ok(ExecuteTransactionResponseV1 { effects: FinalizedEffects::new_from_effects_cert(effects_cert.into()), events, input_objects, @@ -248,7 +248,7 @@ where pub async fn execute_transaction_impl( &self, epoch_store: &AuthorityPerEpochStore, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, client_addr: Option, ) -> Result<(VerifiedTransaction, QuorumDriverResponse), QuorumDriverError> { let transaction = epoch_store @@ -319,7 +319,7 @@ where async fn submit( &self, transaction: VerifiedTransaction, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, client_addr: Option, ) -> IotaResult> + '_> { let tx_digest = *transaction.digest(); @@ -536,7 +536,7 @@ where // world. TODO(william) correctly extract client_addr from logs if let Err(err) = quorum_driver .submit_transaction_no_ticket( - ExecuteTransactionRequestV3 { + ExecuteTransactionRequestV1 { transaction: tx, include_events: true, include_input_objects: false, @@ -735,9 +735,9 @@ where { async fn execute_transaction( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, client_addr: Option, - ) -> Result { - self.execute_transaction_v3(request, client_addr).await + ) -> Result { + self.execute_transaction_v1(request, client_addr).await } } diff --git a/crates/iota-e2e-tests/tests/full_node_tests.rs b/crates/iota-e2e-tests/tests/full_node_tests.rs index 9d5c13e493f..cbd892a0c3f 100644 --- a/crates/iota-e2e-tests/tests/full_node_tests.rs +++ b/crates/iota-e2e-tests/tests/full_node_tests.rs @@ -33,7 +33,7 @@ use iota_types::{ object::{Object, ObjectRead, Owner, PastObjectRead}, programmable_transaction_builder::ProgrammableTransactionBuilder, quorum_driver_types::{ - ExecuteTransactionRequestType, ExecuteTransactionRequestV3, QuorumDriverResponse, + ExecuteTransactionRequestType, ExecuteTransactionRequestV1, QuorumDriverResponse, }, storage::ObjectStore, transaction::{ @@ -749,7 +749,7 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E let digest = *txn.digest(); let res = transaction_orchestrator .execute_transaction_block( - ExecuteTransactionRequestV3::new_v2(txn), + ExecuteTransactionRequestV1::new_v1(txn), ExecuteTransactionRequestType::WaitForLocalExecution, None, ) @@ -784,7 +784,7 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E let digest = *txn.digest(); let res = transaction_orchestrator .execute_transaction_block( - ExecuteTransactionRequestV3::new_v2(txn), + ExecuteTransactionRequestV1::new_v1(txn), ExecuteTransactionRequestType::WaitForEffectsCert, None, ) @@ -1194,7 +1194,7 @@ async fn test_pass_back_no_object() -> Result<(), anyhow::Error> { let digest = *tx.digest(); let _res = transaction_orchestrator .execute_transaction_block( - ExecuteTransactionRequestV3::new_v2(tx), + ExecuteTransactionRequestV1::new_v1(tx), ExecuteTransactionRequestType::WaitForLocalExecution, None, ) diff --git a/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs b/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs index 939b8994916..c1de9381527 100644 --- a/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs +++ b/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs @@ -17,7 +17,7 @@ use iota_test_transaction_builder::{ use iota_types::{ effects::TransactionEffectsAPI, quorum_driver_types::{ - ExecuteTransactionRequestType, ExecuteTransactionRequestV3, ExecuteTransactionResponseV3, + ExecuteTransactionRequestType, ExecuteTransactionRequestV1, ExecuteTransactionResponseV1, FinalizedEffects, IsTransactionExecutedLocally, QuorumDriverError, }, transaction::Transaction, @@ -51,7 +51,7 @@ async fn test_blocking_execution() -> Result<(), anyhow::Error> { orchestrator .quorum_driver() .submit_transaction_no_ticket( - ExecuteTransactionRequestV3::new_v2(txn), + ExecuteTransactionRequestV1::new_v1(txn), Some(make_socket_addr()), ) .await?; @@ -256,7 +256,7 @@ async fn test_tx_across_epoch_boundaries() { tokio::task::spawn(async move { match to .execute_transaction_block( - ExecuteTransactionRequestV3::new_v2(tx.clone()), + ExecuteTransactionRequestV1::new_v1(tx.clone()), ExecuteTransactionRequestType::WaitForEffectsCert, None, ) @@ -297,14 +297,14 @@ async fn execute_with_orchestrator( orchestrator: &TransactionOrchestrator, txn: Transaction, request_type: ExecuteTransactionRequestType, -) -> Result<(ExecuteTransactionResponseV3, IsTransactionExecutedLocally), QuorumDriverError> { +) -> Result<(ExecuteTransactionResponseV1, IsTransactionExecutedLocally), QuorumDriverError> { orchestrator - .execute_transaction_block(ExecuteTransactionRequestV3::new_v2(txn), request_type, None) + .execute_transaction_block(ExecuteTransactionRequestV1::new_v1(txn), request_type, None) .await } #[sim_test] -async fn execute_transaction_v3() -> Result<(), anyhow::Error> { +async fn execute_transaction_v1() -> Result<(), anyhow::Error> { let mut test_cluster = TestClusterBuilder::new().build().await; let context = &mut test_cluster.wallet; let handle = &test_cluster.fullnode_handle.iota_node; @@ -321,14 +321,14 @@ async fn execute_transaction_v3() -> Result<(), anyhow::Error> { // Quorum driver does not execute txn locally let txn = txns.swap_remove(0); - let request = ExecuteTransactionRequestV3 { + let request = ExecuteTransactionRequestV1 { transaction: txn, include_events: true, include_input_objects: true, include_output_objects: true, include_auxiliary_data: false, }; - let response = orchestrator.execute_transaction_v3(request, None).await?; + let response = orchestrator.execute_transaction_v1(request, None).await?; let fx = &response.effects.effects; let mut expected_input_objects = fx.modified_at_versions(); @@ -362,7 +362,7 @@ async fn execute_transaction_v3() -> Result<(), anyhow::Error> { } #[sim_test] -async fn execute_transaction_v3_staking_transaction() -> Result<(), anyhow::Error> { +async fn execute_transaction_v1_staking_transaction() -> Result<(), anyhow::Error> { let mut test_cluster = TestClusterBuilder::new().build().await; let context = &mut test_cluster.wallet; let handle = &test_cluster.fullnode_handle.iota_node; @@ -380,14 +380,14 @@ async fn execute_transaction_v3_staking_transaction() -> Result<(), anyhow::Erro .iota_address; let transaction = make_staking_transaction(context, validator_address).await; - let request = ExecuteTransactionRequestV3 { + let request = ExecuteTransactionRequestV1 { transaction, include_events: true, include_input_objects: true, include_output_objects: true, include_auxiliary_data: false, }; - let response = orchestrator.execute_transaction_v3(request, None).await?; + let response = orchestrator.execute_transaction_v1(request, None).await?; let fx = &response.effects.effects; let mut expected_input_objects = fx.modified_at_versions(); diff --git a/crates/iota-json-rpc/src/transaction_execution_api.rs b/crates/iota-json-rpc/src/transaction_execution_api.rs index 6bde8958932..0d128dd1914 100644 --- a/crates/iota-json-rpc/src/transaction_execution_api.rs +++ b/crates/iota-json-rpc/src/transaction_execution_api.rs @@ -24,7 +24,7 @@ use iota_types::{ effects::TransactionEffectsAPI, iota_serde::BigInt, quorum_driver_types::{ - ExecuteTransactionRequestType, ExecuteTransactionRequestV3, ExecuteTransactionResponseV3, + ExecuteTransactionRequestType, ExecuteTransactionRequestV1, ExecuteTransactionResponseV1, }, signature::GenericSignature, storage::PostExecutionPackageResolver, @@ -79,7 +79,7 @@ impl TransactionExecutionApi { opts: Option, ) -> Result< ( - ExecuteTransactionRequestV3, + ExecuteTransactionRequestV1, IotaTransactionBlockResponseOptions, IotaAddress, Vec, @@ -116,7 +116,7 @@ impl TransactionExecutionApi { None }; - let request = ExecuteTransactionRequestV3 { + let request = ExecuteTransactionRequestV1 { transaction: txn.clone(), include_events: opts.show_events, include_input_objects: opts.show_balance_changes || opts.show_object_changes, @@ -175,7 +175,7 @@ impl TransactionExecutionApi { async fn handle_post_orchestration( &self, - response: ExecuteTransactionResponseV3, + response: ExecuteTransactionResponseV1, is_executed_locally: bool, opts: IotaTransactionBlockResponseOptions, digest: TransactionDigest, diff --git a/crates/iota-rest-api/src/transactions/execution.rs b/crates/iota-rest-api/src/transactions/execution.rs index 7ec25549736..00638f3fe90 100644 --- a/crates/iota-rest-api/src/transactions/execution.rs +++ b/crates/iota-rest-api/src/transactions/execution.rs @@ -73,7 +73,7 @@ async fn execute_transaction( Bcs(transaction): Bcs, ) -> Result> { let executor = state.ok_or_else(|| anyhow::anyhow!("No Transaction Executor"))?; - let request = iota_types::quorum_driver_types::ExecuteTransactionRequestV3 { + let request = iota_types::quorum_driver_types::ExecuteTransactionRequestV1 { transaction: transaction.into(), include_events: parameters.events, include_input_objects: parameters.input_objects || parameters.balance_changes, @@ -81,7 +81,7 @@ async fn execute_transaction( include_auxiliary_data: false, }; - let iota_types::quorum_driver_types::ExecuteTransactionResponseV3 { + let iota_types::quorum_driver_types::ExecuteTransactionResponseV1 { effects, events, input_objects, diff --git a/crates/iota-types/src/quorum_driver_types.rs b/crates/iota-types/src/quorum_driver_types.rs index 6dffb3f4ef1..a81e81b3556 100644 --- a/crates/iota-types/src/quorum_driver_types.rs +++ b/crates/iota-types/src/quorum_driver_types.rs @@ -148,7 +148,7 @@ impl ExecuteTransactionRequest { } #[derive(Serialize, Deserialize, Clone, Debug)] -pub struct ExecuteTransactionRequestV3 { +pub struct ExecuteTransactionRequestV1 { pub transaction: Transaction, pub include_events: bool, @@ -157,19 +157,8 @@ pub struct ExecuteTransactionRequestV3 { pub include_auxiliary_data: bool, } -#[derive(Clone, Debug)] -pub struct VerifiedExecuteTransactionResponseV3 { - pub effects: VerifiedCertifiedTransactionEffects, - pub events: Option, - // Input objects will only be populated in the happy path - pub input_objects: Option>, - // Output objects will only be populated in the happy path - pub output_objects: Option>, - pub auxiliary_data: Option>, -} - -impl ExecuteTransactionRequestV3 { - pub fn new_v2>(transaction: T) -> Self { +impl ExecuteTransactionRequestV1 { + pub fn new_v1>(transaction: T) -> Self { Self { transaction: transaction.into(), include_events: true, @@ -181,7 +170,7 @@ impl ExecuteTransactionRequestV3 { } #[derive(Serialize, Deserialize, Clone, Debug)] -pub struct ExecuteTransactionResponseV3 { +pub struct ExecuteTransactionResponseV1 { pub effects: FinalizedEffects, pub events: Option, diff --git a/crates/iota-types/src/transaction_executor.rs b/crates/iota-types/src/transaction_executor.rs index e2c5cd8a32c..b349ca96810 100644 --- a/crates/iota-types/src/transaction_executor.rs +++ b/crates/iota-types/src/transaction_executor.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::quorum_driver_types::{ - ExecuteTransactionRequestV3, ExecuteTransactionResponseV3, QuorumDriverError, + ExecuteTransactionRequestV1, ExecuteTransactionResponseV1, QuorumDriverError, }; /// Trait to define the interface for how the REST service interacts with a a @@ -12,7 +12,7 @@ use crate::quorum_driver_types::{ pub trait TransactionExecutor: Send + Sync { async fn execute_transaction( &self, - request: ExecuteTransactionRequestV3, + request: ExecuteTransactionRequestV1, client_addr: Option, - ) -> Result; + ) -> Result; } From 0999c01da6d4966f5bb2216ea18723dea3688756 Mon Sep 17 00:00:00 2001 From: Alexander Sporn Date: Wed, 23 Oct 2024 11:41:26 +0200 Subject: [PATCH 13/62] chore(core): removed epoch_store from the StateAccumulator initializers --- .../src/authority/authority_test_utils.rs | 4 +--- .../checkpoints/checkpoint_executor/tests.rs | 4 +--- crates/iota-core/src/checkpoints/mod.rs | 1 - crates/iota-core/src/state_accumulator.rs | 17 +++-------------- crates/iota-core/src/test_utils.rs | 3 +-- .../src/unit_tests/mysticeti_manager_tests.rs | 1 - crates/iota-node/src/lib.rs | 3 --- .../src/single_node.rs | 1 - 8 files changed, 6 insertions(+), 28 deletions(-) diff --git a/crates/iota-core/src/authority/authority_test_utils.rs b/crates/iota-core/src/authority/authority_test_utils.rs index 619d521344a..ed411c269e4 100644 --- a/crates/iota-core/src/authority/authority_test_utils.rs +++ b/crates/iota-core/src/authority/authority_test_utils.rs @@ -87,13 +87,11 @@ pub async fn execute_certificate_with_execution_error( ), IotaError, > { - let epoch_store = authority.load_epoch_store_one_call_per_task(); // We also check the incremental effects of the transaction on the live object // set against StateAccumulator for testing and regression detection. // We must do this before sending to consensus, otherwise consensus may already // lead to transaction execution and state change. - let state_acc = - StateAccumulator::new_for_tests(authority.get_accumulator_store().clone(), &epoch_store); + let state_acc = StateAccumulator::new_for_tests(authority.get_accumulator_store().clone()); let mut state = state_acc.accumulate_cached_live_object_set_for_testing(); if with_shared { diff --git a/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs b/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs index c3ddaea1570..0a3c5b1fcf9 100644 --- a/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs +++ b/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs @@ -409,10 +409,8 @@ async fn init_executor_test( let (checkpoint_sender, _): (Sender, Receiver) = broadcast::channel(buffer_size); - let epoch_store = state.epoch_store_for_testing(); - let accumulator = - StateAccumulator::new_for_tests(state.get_accumulator_store().clone(), &epoch_store); + let accumulator = StateAccumulator::new_for_tests(state.get_accumulator_store().clone()); let accumulator = Arc::new(accumulator); let executor = CheckpointExecutor::new_for_tests( diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs index bb407acb2d7..36337630d58 100644 --- a/crates/iota-core/src/checkpoints/mod.rs +++ b/crates/iota-core/src/checkpoints/mod.rs @@ -2561,7 +2561,6 @@ mod tests { let accumulator = Arc::new(StateAccumulator::new_for_tests( state.get_accumulator_store().clone(), - &epoch_store, )); let (checkpoint_service, _exit) = CheckpointService::spawn( diff --git a/crates/iota-core/src/state_accumulator.rs b/crates/iota-core/src/state_accumulator.rs index 3fa9aaad7c9..755f624274a 100644 --- a/crates/iota-core/src/state_accumulator.rs +++ b/crates/iota-core/src/state_accumulator.rs @@ -155,23 +155,12 @@ fn accumulate_effects(effects: Vec) -> Accumulator { } impl StateAccumulator { - pub fn new( - store: Arc, - epoch_store: &Arc, - metrics: Arc, - ) -> Self { + pub fn new(store: Arc, metrics: Arc) -> Self { StateAccumulator::V1(StateAccumulatorV1::new(store, metrics)) } - pub fn new_for_tests( - store: Arc, - epoch_store: &Arc, - ) -> Self { - Self::new( - store, - epoch_store, - StateAccumulatorMetrics::new(&Registry::new()), - ) + pub fn new_for_tests(store: Arc) -> Self { + Self::new(store, StateAccumulatorMetrics::new(&Registry::new())) } pub fn metrics(&self) -> Arc { diff --git a/crates/iota-core/src/test_utils.rs b/crates/iota-core/src/test_utils.rs index df6e717ea39..a64901311ee 100644 --- a/crates/iota-core/src/test_utils.rs +++ b/crates/iota-core/src/test_utils.rs @@ -79,8 +79,7 @@ pub async fn send_and_confirm_transaction( // // We also check the incremental effects of the transaction on the live object // set against StateAccumulator for testing and regression detection - let state_acc = - StateAccumulator::new_for_tests(authority.get_accumulator_store().clone(), &epoch_store); + let state_acc = StateAccumulator::new_for_tests(authority.get_accumulator_store().clone()); let mut state = state_acc.accumulate_live_object_set(); let (result, _execution_error_opt) = authority.try_execute_for_test(&certificate).await?; let state_after = state_acc.accumulate_live_object_set(); diff --git a/crates/iota-core/src/unit_tests/mysticeti_manager_tests.rs b/crates/iota-core/src/unit_tests/mysticeti_manager_tests.rs index 90ba861b3f7..65195761aee 100644 --- a/crates/iota-core/src/unit_tests/mysticeti_manager_tests.rs +++ b/crates/iota-core/src/unit_tests/mysticeti_manager_tests.rs @@ -30,7 +30,6 @@ pub fn checkpoint_service_for_testing(state: Arc) -> Arc(10); diff --git a/crates/iota-node/src/lib.rs b/crates/iota-node/src/lib.rs index 0468eaefa39..6945b6627f6 100644 --- a/crates/iota-node/src/lib.rs +++ b/crates/iota-node/src/lib.rs @@ -774,7 +774,6 @@ impl IotaNode { let accumulator = Arc::new(StateAccumulator::new( cache_traits.accumulator_store.clone(), - &epoch_store, StateAccumulatorMetrics::new(&prometheus_registry), )); @@ -1713,7 +1712,6 @@ impl IotaNode { .metrics(); let new_accumulator = Arc::new(StateAccumulator::new( self.state.get_accumulator_store().clone(), - &new_epoch_store, accumulator_metrics, )); let weak_accumulator = Arc::downgrade(&new_accumulator); @@ -1765,7 +1763,6 @@ impl IotaNode { .metrics(); let new_accumulator = Arc::new(StateAccumulator::new( self.state.get_accumulator_store().clone(), - &new_epoch_store, accumulator_metrics, )); let weak_accumulator = Arc::downgrade(&new_accumulator); diff --git a/crates/iota-single-node-benchmark/src/single_node.rs b/crates/iota-single-node-benchmark/src/single_node.rs index 2611f9b4e84..862482eb499 100644 --- a/crates/iota-single-node-benchmark/src/single_node.rs +++ b/crates/iota-single-node-benchmark/src/single_node.rs @@ -287,7 +287,6 @@ impl SingleValidator { validator.clone(), Arc::new(StateAccumulator::new_for_tests( validator.get_accumulator_store().clone(), - self.get_epoch_store(), )), ); (checkpoint_executor, ckpt_sender) From 9e17231b4f8e0a4abba489a5da4d7a842c2b2316 Mon Sep 17 00:00:00 2001 From: Alexander Sporn Date: Wed, 23 Oct 2024 11:50:20 +0200 Subject: [PATCH 14/62] chore(narwhal-types): removed comment --- narwhal/types/src/primary.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/narwhal/types/src/primary.rs b/narwhal/types/src/primary.rs index 7208a3b9057..d5ebd4cf080 100644 --- a/narwhal/types/src/primary.rs +++ b/narwhal/types/src/primary.rs @@ -183,7 +183,6 @@ pub trait BatchAPI { fn transactions_mut(&mut self) -> &mut Vec; fn into_transactions(self) -> Vec; - // BatchV1 APIs fn versioned_metadata(&self) -> &VersionedMetadata; fn versioned_metadata_mut(&mut self) -> &mut VersionedMetadata; } From 74b30c2d5fb78501c469684ae38094b4f3ffed16 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Fri, 4 Oct 2024 21:53:46 +0800 Subject: [PATCH 15/62] refactor(iota-types/iota-system-state): Make IotaSystemStateInnerV2 to V1 --- crates/iota-genesis-builder/src/lib.rs | 1 - crates/iota-json-rpc/src/coin_api.rs | 1 + .../iota_system_state_inner_v1.rs | 6 +- .../iota_system_state_inner_v2.rs | 306 ------------------ .../iota-types/src/iota_system_state/mod.rs | 26 +- 5 files changed, 7 insertions(+), 333 deletions(-) delete mode 100644 crates/iota-types/src/iota_system_state/iota_system_state_inner_v2.rs diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index b0d6baa2622..bf5359c30a3 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -465,7 +465,6 @@ impl Builder { // In non-testing code, genesis type must always be V1. let system_state = match unsigned_genesis.iota_system_object() { IotaSystemState::V1(inner) => inner, - IotaSystemState::V2(_) => unreachable!(), #[cfg(msim)] _ => { // Types other than V1 used in simtests do not need to be validated. diff --git a/crates/iota-json-rpc/src/coin_api.rs b/crates/iota-json-rpc/src/coin_api.rs index fb491c5a3a4..a909b8f212e 100644 --- a/crates/iota-json-rpc/src/coin_api.rs +++ b/crates/iota-json-rpc/src/coin_api.rs @@ -1434,6 +1434,7 @@ mod tests { }, parameters: SystemParametersV1 { epoch_duration_ms: Default::default(), + min_validator_count: Default::default(), max_validator_count: Default::default(), min_validator_joining_stake: Default::default(), validator_low_stake_threshold: Default::default(), diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs index 572d793843c..c9b375de3e2 100644 --- a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs +++ b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs @@ -45,6 +45,9 @@ pub struct SystemParametersV1 { /// The duration of an epoch, in milliseconds. pub epoch_duration_ms: u64, + /// Minimum number of active validators at any moment. + pub min_validator_count: u64, + /// Maximum number of active validators at any moment. /// We do not allow the number of validators in any epoch to go above this. pub max_validator_count: u64, @@ -552,7 +555,7 @@ impl IotaSystemStateTrait for IotaSystemStateInnerV1 { let table_id = self.validators.pending_active_validators.contents.id; let table_size = self.validators.pending_active_validators.contents.size; let validators: Vec = - get_validators_from_table_vec(object_store, table_id, table_size)?; + get_validators_from_table_vec(&object_store, table_id, table_size)?; Ok(validators .into_iter() .map(|v| v.into_iota_validator_summary()) @@ -637,6 +640,7 @@ impl IotaSystemStateTrait for IotaSystemStateInnerV1 { parameters: SystemParametersV1 { epoch_duration_ms, + min_validator_count: _, // TODO: Add it to RPC layer in the future. max_validator_count, min_validator_joining_stake, validator_low_stake_threshold, diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v2.rs b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v2.rs deleted file mode 100644 index 0d8930c6e2a..00000000000 --- a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v2.rs +++ /dev/null @@ -1,306 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -use serde::{Deserialize, Serialize}; - -use super::{ - AdvanceEpochParams, IotaSystemStateTrait, - epoch_start_iota_system_state::EpochStartValidatorInfoV1, - iota_system_state_inner_v1::ValidatorV1, - iota_system_state_summary::{IotaSystemStateSummary, IotaValidatorSummary}, -}; -use crate::{ - balance::Balance, - base_types::IotaAddress, - collection_types::{Bag, Table, TableVec, VecMap, VecSet}, - committee::{CommitteeWithNetworkMetadata, NetworkMetadata}, - error::IotaError, - gas_coin::IotaTreasuryCap, - iota_system_state::{ - epoch_start_iota_system_state::EpochStartSystemState, - get_validators_from_table_vec, - iota_system_state_inner_v1::{StorageFundV1, ValidatorSetV1}, - }, - storage::ObjectStore, -}; - -/// Rust version of the Move iota::iota_system::SystemParametersV2 type -#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct SystemParametersV2 { - /// The duration of an epoch, in milliseconds. - pub epoch_duration_ms: u64, - - /// Minimum number of active validators at any moment. - pub min_validator_count: u64, - - /// Maximum number of active validators at any moment. - /// We do not allow the number of validators in any epoch to go above this. - pub max_validator_count: u64, - - /// Lower-bound on the amount of stake required to become a validator. - pub min_validator_joining_stake: u64, - - /// Validators with stake amount below `validator_low_stake_threshold` are - /// considered to have low stake and will be escorted out of the - /// validator set after being below this threshold for more than - /// `validator_low_stake_grace_period` number of epochs. - pub validator_low_stake_threshold: u64, - - /// Validators with stake below `validator_very_low_stake_threshold` will be - /// removed immediately at epoch change, no grace period. - pub validator_very_low_stake_threshold: u64, - - /// A validator can have stake below `validator_low_stake_threshold` - /// for this many epochs before being kicked out. - pub validator_low_stake_grace_period: u64, - - pub extra_fields: Bag, -} - -/// Rust version of the Move iota_system::iota_system::IotaSystemStateInnerV2 -/// type -#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct IotaSystemStateInnerV2 { - pub epoch: u64, - pub protocol_version: u64, - pub system_state_version: u64, - pub iota_treasury_cap: IotaTreasuryCap, - pub validators: ValidatorSetV1, - pub storage_fund: StorageFundV1, - pub parameters: SystemParametersV2, - pub reference_gas_price: u64, - pub validator_report_records: VecMap>, - pub safe_mode: bool, - pub safe_mode_storage_charges: Balance, - pub safe_mode_computation_rewards: Balance, - pub safe_mode_storage_rebates: u64, - pub safe_mode_non_refundable_storage_fee: u64, - pub epoch_start_timestamp_ms: u64, - pub extra_fields: Bag, - // TODO: Use getters instead of all pub. -} - -impl IotaSystemStateTrait for IotaSystemStateInnerV2 { - fn epoch(&self) -> u64 { - self.epoch - } - - fn reference_gas_price(&self) -> u64 { - self.reference_gas_price - } - - fn protocol_version(&self) -> u64 { - self.protocol_version - } - - fn system_state_version(&self) -> u64 { - self.system_state_version - } - - fn epoch_start_timestamp_ms(&self) -> u64 { - self.epoch_start_timestamp_ms - } - - fn epoch_duration_ms(&self) -> u64 { - self.parameters.epoch_duration_ms - } - - fn safe_mode(&self) -> bool { - self.safe_mode - } - - fn advance_epoch_safe_mode(&mut self, params: &AdvanceEpochParams) { - self.epoch = params.epoch; - self.safe_mode = true; - self.safe_mode_storage_charges - .deposit_for_safe_mode(params.storage_charge); - self.safe_mode_storage_rebates += params.storage_rebate; - self.safe_mode_computation_rewards - .deposit_for_safe_mode(params.computation_charge); - self.safe_mode_non_refundable_storage_fee += params.non_refundable_storage_fee; - self.epoch_start_timestamp_ms = params.epoch_start_timestamp_ms; - self.protocol_version = params.next_protocol_version.as_u64(); - } - - fn get_current_epoch_committee(&self) -> CommitteeWithNetworkMetadata { - let validators = self - .validators - .active_validators - .iter() - .map(|validator| { - let verified_metadata = validator.verified_metadata(); - let name = verified_metadata.iota_pubkey_bytes(); - ( - name, - (validator.voting_power, NetworkMetadata { - network_address: verified_metadata.net_address.clone(), - narwhal_primary_address: verified_metadata.primary_address.clone(), - }), - ) - }) - .collect(); - CommitteeWithNetworkMetadata::new(self.epoch, validators) - } - - fn get_pending_active_validators( - &self, - object_store: &S, - ) -> Result, IotaError> { - let table_id = self.validators.pending_active_validators.contents.id; - let table_size = self.validators.pending_active_validators.contents.size; - let validators: Vec = - get_validators_from_table_vec(&object_store, table_id, table_size)?; - Ok(validators - .into_iter() - .map(|v| v.into_iota_validator_summary()) - .collect()) - } - - fn into_epoch_start_state(self) -> EpochStartSystemState { - EpochStartSystemState::new_v1( - self.epoch, - self.protocol_version, - self.reference_gas_price, - self.safe_mode, - self.epoch_start_timestamp_ms, - self.parameters.epoch_duration_ms, - self.validators - .active_validators - .iter() - .map(|validator| { - let metadata = validator.verified_metadata(); - EpochStartValidatorInfoV1 { - iota_address: metadata.iota_address, - protocol_pubkey: metadata.protocol_pubkey.clone(), - narwhal_network_pubkey: metadata.network_pubkey.clone(), - narwhal_worker_pubkey: metadata.worker_pubkey.clone(), - iota_net_address: metadata.net_address.clone(), - p2p_address: metadata.p2p_address.clone(), - narwhal_primary_address: metadata.primary_address.clone(), - narwhal_worker_address: metadata.worker_address.clone(), - voting_power: validator.voting_power, - hostname: metadata.name.clone(), - } - }) - .collect(), - ) - } - - fn into_iota_system_state_summary(self) -> IotaSystemStateSummary { - // If you are making any changes to IotaSystemStateV1 or any of its dependent - // types before mainnet, please also update IotaSystemStateSummary and - // its corresponding TS type. Post-mainnet, we will need to introduce a - // new version. - let Self { - epoch, - protocol_version, - system_state_version, - iota_treasury_cap, - validators: - ValidatorSetV1 { - total_stake, - active_validators, - pending_active_validators: - TableVec { - contents: - Table { - id: pending_active_validators_id, - size: pending_active_validators_size, - }, - }, - pending_removals, - staking_pool_mappings: - Table { - id: staking_pool_mappings_id, - size: staking_pool_mappings_size, - }, - inactive_validators: - Table { - id: inactive_pools_id, - size: inactive_pools_size, - }, - validator_candidates: - Table { - id: validator_candidates_id, - size: validator_candidates_size, - }, - at_risk_validators: - VecMap { - contents: at_risk_validators, - }, - extra_fields: _, - }, - storage_fund, - parameters: - SystemParametersV2 { - epoch_duration_ms, - min_validator_count: _, // TODO: Add it to RPC layer in the future. - max_validator_count, - min_validator_joining_stake, - validator_low_stake_threshold, - validator_very_low_stake_threshold, - validator_low_stake_grace_period, - extra_fields: _, - }, - reference_gas_price, - validator_report_records: - VecMap { - contents: validator_report_records, - }, - safe_mode, - safe_mode_storage_charges, - safe_mode_computation_rewards, - safe_mode_storage_rebates, - safe_mode_non_refundable_storage_fee, - epoch_start_timestamp_ms, - extra_fields: _, - } = self; - IotaSystemStateSummary { - epoch, - protocol_version, - system_state_version, - iota_total_supply: iota_treasury_cap.total_supply().value, - iota_treasury_cap_id: iota_treasury_cap.id().to_owned(), - storage_fund_total_object_storage_rebates: storage_fund - .total_object_storage_rebates - .value(), - storage_fund_non_refundable_balance: storage_fund.non_refundable_balance.value(), - reference_gas_price, - safe_mode, - safe_mode_storage_charges: safe_mode_storage_charges.value(), - safe_mode_computation_rewards: safe_mode_computation_rewards.value(), - safe_mode_storage_rebates, - safe_mode_non_refundable_storage_fee, - epoch_start_timestamp_ms, - epoch_duration_ms, - total_stake, - active_validators: active_validators - .into_iter() - .map(|v| v.into_iota_validator_summary()) - .collect(), - pending_active_validators_id, - pending_active_validators_size, - pending_removals, - staking_pool_mappings_id, - staking_pool_mappings_size, - inactive_pools_id, - inactive_pools_size, - validator_candidates_id, - validator_candidates_size, - at_risk_validators: at_risk_validators - .into_iter() - .map(|e| (e.key, e.value)) - .collect(), - validator_report_records: validator_report_records - .into_iter() - .map(|e| (e.key, e.value.contents)) - .collect(), - max_validator_count, - min_validator_joining_stake, - validator_low_stake_threshold, - validator_very_low_stake_threshold, - validator_low_stake_grace_period, - } - } -} diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index 236d056e5fd..500bd2d74df 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -21,10 +21,7 @@ use crate::{ dynamic_field::{Field, get_dynamic_field_from_store, get_dynamic_field_object_from_store}, error::IotaError, id::UID, - iota_system_state::{ - epoch_start_iota_system_state::EpochStartSystemState, - iota_system_state_inner_v2::IotaSystemStateInnerV2, - }, + iota_system_state::epoch_start_iota_system_state::EpochStartSystemState, object::{MoveObject, Object}, storage::ObjectStore, versioned::Versioned, @@ -32,7 +29,6 @@ use crate::{ pub mod epoch_start_iota_system_state; pub mod iota_system_state_inner_v1; -pub mod iota_system_state_inner_v2; pub mod iota_system_state_summary; #[cfg(msim)] @@ -106,13 +102,6 @@ impl IotaSystemStateWrapper { protocol_config, ); } - 2 => { - Self::advance_epoch_safe_mode_impl::( - move_object, - params, - protocol_config, - ); - } #[cfg(msim)] IOTA_SYSTEM_STATE_SIM_TEST_V1 => { Self::advance_epoch_safe_mode_impl::( @@ -201,7 +190,6 @@ pub trait IotaSystemStateTrait { #[enum_dispatch(IotaSystemStateTrait)] pub enum IotaSystemState { V1(IotaSystemStateInnerV1), - V2(IotaSystemStateInnerV2), #[cfg(msim)] SimTestV1(SimTestIotaSystemStateInnerV1), #[cfg(msim)] @@ -267,18 +255,6 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result { - let result: IotaSystemStateInnerV2 = - get_dynamic_field_from_store(object_store, id, &wrapper.version).map_err( - |err| { - IotaError::DynamicFieldRead(format!( - "Failed to load iota system state inner object with ID {:?} and version {:?}: {:?}", - id, wrapper.version, err - )) - }, - )?; - Ok(IotaSystemState::V2(result)) - } #[cfg(msim)] IOTA_SYSTEM_STATE_SIM_TEST_V1 => { let result: SimTestIotaSystemStateInnerV1 = From bdaed8235bb0daaca17f893fad83a95d0e0dd6be Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 9 Oct 2024 16:08:16 +0800 Subject: [PATCH 16/62] refactor(iota-types/iota-system-state): Rename IotaSystemStateInnerV1 to IotaSystemStateV1 --- crates/iota-json-rpc/src/coin_api.rs | 6 +++--- .../iota_system_state/iota_system_state_inner_v1.rs | 4 ++-- crates/iota-types/src/iota_system_state/mod.rs | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/iota-json-rpc/src/coin_api.rs b/crates/iota-json-rpc/src/coin_api.rs index a909b8f212e..7d190781c82 100644 --- a/crates/iota-json-rpc/src/coin_api.rs +++ b/crates/iota-json-rpc/src/coin_api.rs @@ -1273,7 +1273,7 @@ mod tests { iota_system_state::{ IotaSystemState, iota_system_state_inner_v1::{ - IotaSystemStateInnerV1, StorageFundV1, SystemParametersV1, ValidatorSetV1, + IotaSystemStateV1, StorageFundV1, SystemParametersV1, ValidatorSetV1, }, }, }; @@ -1400,8 +1400,8 @@ mod tests { expected.assert_eq(error_result.message()); } - fn default_system_state() -> IotaSystemStateInnerV1 { - IotaSystemStateInnerV1 { + fn default_system_state() -> IotaSystemStateV1 { + IotaSystemStateV1 { epoch: Default::default(), protocol_version: Default::default(), system_state_version: Default::default(), diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs index c9b375de3e2..b6479ca4d99 100644 --- a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs +++ b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs @@ -466,7 +466,7 @@ pub struct StorageFundV1 { /// Rust version of the Move iota_system::iota_system::IotaSystemStateInner type #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct IotaSystemStateInnerV1 { +pub struct IotaSystemStateV1 { pub epoch: u64, pub protocol_version: u64, pub system_state_version: u64, @@ -486,7 +486,7 @@ pub struct IotaSystemStateInnerV1 { // TODO: Use getters instead of all pub. } -impl IotaSystemStateTrait for IotaSystemStateInnerV1 { +impl IotaSystemStateTrait for IotaSystemStateV1 { fn epoch(&self) -> u64 { self.epoch } diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index 500bd2d74df..c4b31a56f29 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -11,7 +11,7 @@ use move_core_types::{ident_str, identifier::IdentStr, language_storage::StructT use serde::{Deserialize, Serialize, de::DeserializeOwned}; use self::{ - iota_system_state_inner_v1::{IotaSystemStateInnerV1, ValidatorV1}, + iota_system_state_inner_v1::{IotaSystemStateV1, ValidatorV1}, iota_system_state_summary::{IotaSystemStateSummary, IotaValidatorSummary}, }; use crate::{ @@ -96,7 +96,7 @@ impl IotaSystemStateWrapper { .expect("Dynamic field object must be a Move object"); match self.version { 1 => { - Self::advance_epoch_safe_mode_impl::( + Self::advance_epoch_safe_mode_impl::( move_object, params, protocol_config, @@ -189,7 +189,7 @@ pub trait IotaSystemStateTrait { #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] #[enum_dispatch(IotaSystemStateTrait)] pub enum IotaSystemState { - V1(IotaSystemStateInnerV1), + V1(IotaSystemStateV1), #[cfg(msim)] SimTestV1(SimTestIotaSystemStateInnerV1), #[cfg(msim)] @@ -199,7 +199,7 @@ pub enum IotaSystemState { } /// This is the fixed type used by genesis. -pub type IotaSystemStateInnerGenesis = IotaSystemStateInnerV1; +pub type IotaSystemStateInnerGenesis = IotaSystemStateV1; pub type IotaValidatorGenesis = ValidatorV1; impl IotaSystemState { @@ -244,7 +244,7 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result { - let result: IotaSystemStateInnerV1 = + let result: IotaSystemStateV1 = get_dynamic_field_from_store(object_store, id, &wrapper.version).map_err( |err| { IotaError::DynamicFieldRead(format!( From ea08c52212ea1c2dbb8d5b54ab5db819665fcadc Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 9 Oct 2024 16:10:37 +0800 Subject: [PATCH 17/62] refactor(iota-types/iota-system-state): Add the `PoolTokenExchangeRate` enum to encapsulate the inner versioned type --- .../iota-indexer/src/apis/governance_api.rs | 2 +- crates/iota-json-rpc/src/governance_api.rs | 2 +- .../iota-types/src/iota_system_state/mod.rs | 25 ++++++++++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/crates/iota-indexer/src/apis/governance_api.rs b/crates/iota-indexer/src/apis/governance_api.rs index d697288cfdb..d5cdf80967a 100644 --- a/crates/iota-indexer/src/apis/governance_api.rs +++ b/crates/iota-indexer/src/apis/governance_api.rs @@ -19,7 +19,7 @@ use iota_types::{ committee::EpochId, governance::StakedIota, iota_serde::BigInt, - iota_system_state::{PoolTokenExchangeRate, iota_system_state_summary::IotaSystemStateSummary}, + iota_system_state::{PoolTokenExchangeRate, PoolTokenExchangeRateTrait, iota_system_state_summary::IotaSystemStateSummary}, timelock::timelocked_staked_iota::TimelockedStakedIota, }; use jsonrpsee::{RpcModule, core::RpcResult}; diff --git a/crates/iota-json-rpc/src/governance_api.rs b/crates/iota-json-rpc/src/governance_api.rs index 071a9b588d4..6d6ace23433 100644 --- a/crates/iota-json-rpc/src/governance_api.rs +++ b/crates/iota-json-rpc/src/governance_api.rs @@ -25,7 +25,7 @@ use iota_types::{ id::ID, iota_serde::BigInt, iota_system_state::{ - IotaSystemState, IotaSystemStateTrait, PoolTokenExchangeRate, get_validator_from_table, + IotaSystemState, IotaSystemStateTrait, PoolTokenExchangeRate, PoolTokenExchangeRateTrait, get_validator_from_table, iota_system_state_summary::IotaSystemStateSummary, }, object::{Object, ObjectRead}, diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index c4b31a56f29..aa7ff8504bf 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -388,15 +388,28 @@ where Ok(validators) } +/// This is the standard API that all inner PoolTokenExchangeRate object type should +/// implement. +#[enum_dispatch] +pub trait PoolTokenExchangeRateTrait { + fn rate(&self) -> f64; +} + +#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] +#[enum_dispatch(PoolTokenExchangeRateTrait)] +pub enum PoolTokenExchangeRate { + V1(PoolTokenExchangeRateV1), +} + #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Default)] -pub struct PoolTokenExchangeRate { +pub struct PoolTokenExchangeRateV1 { iota_amount: u64, pool_token_amount: u64, } -impl PoolTokenExchangeRate { +impl PoolTokenExchangeRateTrait for PoolTokenExchangeRateV1 { /// Rate of the staking pool, pool token amount : Iota amount - pub fn rate(&self) -> f64 { + fn rate(&self) -> f64 { if self.iota_amount == 0 { 1_f64 } else { @@ -405,6 +418,12 @@ impl PoolTokenExchangeRate { } } +impl Default for PoolTokenExchangeRate { + fn default() -> Self { + PoolTokenExchangeRate::V1(PoolTokenExchangeRateV1::default()) + } +} + #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct ValidatorWrapper { pub inner: Versioned, From 9f1e0eeba151ea2d812a2b49e7e0c2f78a670a93 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 9 Oct 2024 16:11:45 +0800 Subject: [PATCH 18/62] refactor(iota-types/iota-system-state): Rename ValidatorWrapper to Validator --- crates/iota-types/src/iota_system_state/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index aa7ff8504bf..b1d024ee63f 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -304,7 +304,7 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result( object_store: &dyn ObjectStore, table_id: ObjectID, @@ -313,7 +313,7 @@ pub fn get_validator_from_table( where K: MoveTypeTagTrait + Serialize + DeserializeOwned + fmt::Debug, { - let field: ValidatorWrapper = get_dynamic_field_from_store(object_store, table_id, key) + let field: Validator = get_dynamic_field_from_store(object_store, table_id, key) .map_err(|err| { IotaError::IotaSystemStateRead(format!( "Failed to load validator wrapper from table: {:?}", @@ -425,7 +425,7 @@ impl Default for PoolTokenExchangeRate { } #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct ValidatorWrapper { +pub struct Validator { pub inner: Versioned, } From f7bc549870ff45fe90c0dd0097bfc8027ba425c2 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 9 Oct 2024 16:21:40 +0800 Subject: [PATCH 19/62] refactor(iota-types/iota-system-state): Rename UnverifiedValidatorOperationCapV1 to UnverifiedValidatorOperationCap --- .../src/iota_system_state/iota_system_state_inner_v1.rs | 2 +- crates/iota/src/validator_commands.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs index b6479ca4d99..30cf1fd195d 100644 --- a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs +++ b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs @@ -713,7 +713,7 @@ impl IotaSystemStateTrait for IotaSystemStateV1 { /// Rust version of the Move /// iota_system::validator_cap::UnverifiedValidatorOperationCap type #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct UnverifiedValidatorOperationCapV1 { +pub struct UnverifiedValidatorOperationCap { pub id: ObjectID, pub authorizer_validator_address: IotaAddress, } diff --git a/crates/iota/src/validator_commands.rs b/crates/iota/src/validator_commands.rs index c853ccc907d..21a6ee56391 100644 --- a/crates/iota/src/validator_commands.rs +++ b/crates/iota/src/validator_commands.rs @@ -44,7 +44,7 @@ use iota_types::{ generate_proof_of_possession, get_authority_key_pair, }, iota_system_state::{ - iota_system_state_inner_v1::{UnverifiedValidatorOperationCapV1, ValidatorV1}, + iota_system_state_inner_v1::{UnverifiedValidatorOperationCap, ValidatorV1}, iota_system_state_summary::{IotaSystemStateSummary, IotaValidatorSummary}, }, multiaddr::Multiaddr, @@ -868,7 +868,7 @@ async fn get_validator_summary_from_cap_id( operation_cap_id ) })?; - let cap = bcs::from_bytes::(bcs).map_err(|e| { + let cap = bcs::from_bytes::(bcs).map_err(|e| { anyhow::anyhow!( "Can't convert bcs bytes of object {} to UnverifiedValidatorOperationCapV1: {}", operation_cap_id, From a1803502057e1f16b22c485087c9be841fb1afd5 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 9 Oct 2024 20:11:19 +0800 Subject: [PATCH 20/62] doc(iota-types/iota-system-state): Fix wrong type in comments --- .../iota_system_state/iota_system_state_inner_v1.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs index 30cf1fd195d..9e67f28d013 100644 --- a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs +++ b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs @@ -301,7 +301,7 @@ impl ValidatorMetadataV1 { } } -/// Rust version of the Move iota::validator::Validator type +/// Rust version of the Move iota::validator::ValidatorV1 type #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct ValidatorV1 { metadata: ValidatorMetadataV1, @@ -427,7 +427,7 @@ impl ValidatorV1 { } } -/// Rust version of the Move iota_system::staking_pool::StakingPool type +/// Rust version of the Move iota_system::staking_pool::StakingPoolV1 type #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct StakingPoolV1 { pub id: ObjectID, @@ -443,7 +443,7 @@ pub struct StakingPoolV1 { pub extra_fields: Bag, } -/// Rust version of the Move iota_system::validator_set::ValidatorSet type +/// Rust version of the Move iota_system::validator_set::ValidatorSetV1 type #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct ValidatorSetV1 { pub total_stake: u64, @@ -457,14 +457,14 @@ pub struct ValidatorSetV1 { pub extra_fields: Bag, } -/// Rust version of the Move iota_system::storage_fund::StorageFund type +/// Rust version of the Move iota_system::storage_fund::StorageFundV1 type #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct StorageFundV1 { pub total_object_storage_rebates: Balance, pub non_refundable_balance: Balance, } -/// Rust version of the Move iota_system::iota_system::IotaSystemStateInner type +/// Rust version of the Move iota_system::iota_system::IotaSystemStateV1 type #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct IotaSystemStateV1 { pub epoch: u64, From 23da4c915eb58dfb3073ad8615beb075038d3b8a Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Mon, 14 Oct 2024 14:21:19 +0800 Subject: [PATCH 21/62] refactor: Format with clippy and rustfmt --- crates/iota-genesis-builder/src/lib.rs | 9 +-------- crates/iota-indexer/src/apis/governance_api.rs | 5 ++++- crates/iota-json-rpc/src/governance_api.rs | 4 ++-- crates/iota-types/src/iota_system_state/mod.rs | 9 ++++----- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index bf5359c30a3..2b29256daa6 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -463,14 +463,7 @@ impl Builder { } = self.parameters.to_genesis_chain_parameters(); // In non-testing code, genesis type must always be V1. - let system_state = match unsigned_genesis.iota_system_object() { - IotaSystemState::V1(inner) => inner, - #[cfg(msim)] - _ => { - // Types other than V1 used in simtests do not need to be validated. - return; - } - }; + let IotaSystemState::V1(system_state) = unsigned_genesis.iota_system_object(); let protocol_config = get_genesis_protocol_config(ProtocolVersion::new(protocol_version)); diff --git a/crates/iota-indexer/src/apis/governance_api.rs b/crates/iota-indexer/src/apis/governance_api.rs index d5cdf80967a..c8a53e558a9 100644 --- a/crates/iota-indexer/src/apis/governance_api.rs +++ b/crates/iota-indexer/src/apis/governance_api.rs @@ -19,7 +19,10 @@ use iota_types::{ committee::EpochId, governance::StakedIota, iota_serde::BigInt, - iota_system_state::{PoolTokenExchangeRate, PoolTokenExchangeRateTrait, iota_system_state_summary::IotaSystemStateSummary}, + iota_system_state::{ + PoolTokenExchangeRate, PoolTokenExchangeRateTrait, + iota_system_state_summary::IotaSystemStateSummary, + }, timelock::timelocked_staked_iota::TimelockedStakedIota, }; use jsonrpsee::{RpcModule, core::RpcResult}; diff --git a/crates/iota-json-rpc/src/governance_api.rs b/crates/iota-json-rpc/src/governance_api.rs index 6d6ace23433..854a73b588f 100644 --- a/crates/iota-json-rpc/src/governance_api.rs +++ b/crates/iota-json-rpc/src/governance_api.rs @@ -25,8 +25,8 @@ use iota_types::{ id::ID, iota_serde::BigInt, iota_system_state::{ - IotaSystemState, IotaSystemStateTrait, PoolTokenExchangeRate, PoolTokenExchangeRateTrait, get_validator_from_table, - iota_system_state_summary::IotaSystemStateSummary, + IotaSystemState, IotaSystemStateTrait, PoolTokenExchangeRate, PoolTokenExchangeRateTrait, + get_validator_from_table, iota_system_state_summary::IotaSystemStateSummary, }, object::{Object, ObjectRead}, timelock::timelocked_staked_iota::TimelockedStakedIota, diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index b1d024ee63f..e9655b32a2e 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -211,7 +211,6 @@ impl IotaSystemState { pub fn into_genesis_version_for_tooling(self) -> IotaSystemStateInnerGenesis { match self { IotaSystemState::V1(inner) => inner, - _ => unreachable!(), } } @@ -313,8 +312,8 @@ pub fn get_validator_from_table( where K: MoveTypeTagTrait + Serialize + DeserializeOwned + fmt::Debug, { - let field: Validator = get_dynamic_field_from_store(object_store, table_id, key) - .map_err(|err| { + let field: Validator = + get_dynamic_field_from_store(object_store, table_id, key).map_err(|err| { IotaError::IotaSystemStateRead(format!( "Failed to load validator wrapper from table: {:?}", err @@ -388,8 +387,8 @@ where Ok(validators) } -/// This is the standard API that all inner PoolTokenExchangeRate object type should -/// implement. +/// This is the standard API that all inner PoolTokenExchangeRate object type +/// should implement. #[enum_dispatch] pub trait PoolTokenExchangeRateTrait { fn rate(&self) -> f64; From a6b16945c9877ac279868fee0b7f3ccf913f67c9 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Tue, 15 Oct 2024 13:56:49 +0800 Subject: [PATCH 22/62] refactor(iota-framework/iota-system): Rename ValidatorWrapper to Validator --- .../iota-system/sources/validator_set.move | 6 +++--- .../iota-system/sources/validator_wrapper.move | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/iota-framework/packages/iota-system/sources/validator_set.move b/crates/iota-framework/packages/iota-system/sources/validator_set.move index 522a3e33e6d..8c1c0db5326 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator_set.move +++ b/crates/iota-framework/packages/iota-system/sources/validator_set.move @@ -16,7 +16,7 @@ module iota_system::validator_set { use iota::event; use iota::table_vec::{Self, TableVec}; use iota_system::voting_power; - use iota_system::validator_wrapper::ValidatorWrapper; + use iota_system::validator_wrapper::Validator; use iota_system::validator_wrapper; use iota::bag::Bag; use iota::bag; @@ -42,14 +42,14 @@ module iota_system::validator_set { /// Mapping from a staking pool ID to the inactive validator that has that pool as its staking pool. /// When a validator is deactivated the validator is removed from `active_validators` it /// is added to this table so that stakers can continue to withdraw their stake from it. - inactive_validators: Table, + inactive_validators: Table, /// Table storing preactive/candidate validators, mapping their addresses to their `ValidatorV1 ` structs. /// When an address calls `request_add_validator_candidate`, they get added to this table and become a preactive /// validator. /// When the candidate has met the min stake requirement, they can call `request_add_validator` to /// officially add them to the active validator set `active_validators` next epoch. - validator_candidates: Table, + validator_candidates: Table, /// Table storing the number of epochs during which a validator's stake has been below the low stake threshold. at_risk_validators: VecMap, diff --git a/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move b/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move index 56f63e27b36..f4932d4c6fa 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move +++ b/crates/iota-framework/packages/iota-system/sources/validator_wrapper.move @@ -9,44 +9,44 @@ module iota_system::validator_wrapper { const EInvalidVersion: u64 = 0; - public struct ValidatorWrapper has store { + public struct Validator has store { inner: Versioned } // ValidatorV1 corresponds to version 1. - public(package) fun create_v1(validator: ValidatorV1, ctx: &mut TxContext): ValidatorWrapper { - ValidatorWrapper { + public(package) fun create_v1(validator: ValidatorV1, ctx: &mut TxContext): Validator { + Validator { inner: versioned::create(1, validator, ctx) } } /// This function should always return the latest supported version. /// If the inner version is old, we upgrade it lazily in-place. - public(package) fun load_validator_maybe_upgrade(self: &mut ValidatorWrapper): &mut ValidatorV1 { + public(package) fun load_validator_maybe_upgrade(self: &mut Validator): &mut ValidatorV1 { upgrade_to_latest(self); versioned::load_value_mut(&mut self.inner) } /// Destroy the wrapper and retrieve the inner validator object. - public(package) fun destroy(self: ValidatorWrapper): ValidatorV1 { + public(package) fun destroy(self: Validator): ValidatorV1 { upgrade_to_latest(&self); - let ValidatorWrapper { inner } = self; + let Validator { inner } = self; versioned::destroy(inner) } #[test_only] /// Load the inner validator with assumed type. This should be used for testing only. - public(package) fun get_inner_validator_ref(self: &ValidatorWrapper): &ValidatorV1 { + public(package) fun get_inner_validator_ref(self: &Validator): &ValidatorV1 { versioned::load_value(&self.inner) } - fun upgrade_to_latest(self: &ValidatorWrapper) { + fun upgrade_to_latest(self: &Validator) { let version = version(self); // TODO: When new versions are added, we need to explicitly upgrade here. assert!(version == 1, EInvalidVersion); } - fun version(self: &ValidatorWrapper): u64 { + fun version(self: &Validator): u64 { versioned::version(&self.inner) } } From c1f9606d7d45c5a0e5568051e2e88246586836a1 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Tue, 15 Oct 2024 13:59:50 +0800 Subject: [PATCH 23/62] chore(iota-types): Add the issue to the TODO in comment --- .../src/iota_system_state/iota_system_state_inner_v1.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs index 9e67f28d013..65d5e95e504 100644 --- a/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs +++ b/crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs @@ -640,7 +640,7 @@ impl IotaSystemStateTrait for IotaSystemStateV1 { parameters: SystemParametersV1 { epoch_duration_ms, - min_validator_count: _, // TODO: Add it to RPC layer in the future. + min_validator_count: _, /* TODO: Add it to RPC layer in the future https://github.com/iotaledger/iota/issues/3232. */ max_validator_count, min_validator_joining_stake, validator_low_stake_threshold, From 14308e808b72b905529a8199b612a059431c62b8 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Tue, 15 Oct 2024 20:42:43 +0800 Subject: [PATCH 24/62] refactor(iota-types/timelock): Wrap TimelockedStakedIotaV1 with enum TimelockedStakedIota --- crates/iota-genesis-builder/src/lib.rs | 2 +- .../iota-indexer/src/apis/governance_api.rs | 2 +- crates/iota-json-rpc/src/governance_api.rs | 2 +- .../src/timelock/timelocked_staked_iota.rs | 91 +++++++++++++++---- 4 files changed, 75 insertions(+), 22 deletions(-) diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index 2b29256daa6..a52a92f4b99 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -66,7 +66,7 @@ use iota_types::{ stardust::stardust_to_iota_address, timelock::{ stardust_upgrade_label::STARDUST_UPGRADE_LABEL_VALUE, - timelocked_staked_iota::TimelockedStakedIota, + timelocked_staked_iota::{TimelockedStakedIota, TimelockedStakedIotaTrait}, }, transaction::{ CallArg, CheckedInputObjects, Command, InputObjectKind, ObjectArg, ObjectReadResult, diff --git a/crates/iota-indexer/src/apis/governance_api.rs b/crates/iota-indexer/src/apis/governance_api.rs index c8a53e558a9..0a3448c0b22 100644 --- a/crates/iota-indexer/src/apis/governance_api.rs +++ b/crates/iota-indexer/src/apis/governance_api.rs @@ -23,7 +23,7 @@ use iota_types::{ PoolTokenExchangeRate, PoolTokenExchangeRateTrait, iota_system_state_summary::IotaSystemStateSummary, }, - timelock::timelocked_staked_iota::TimelockedStakedIota, + timelock::timelocked_staked_iota::{TimelockedStakedIota, TimelockedStakedIotaTrait}, }; use jsonrpsee::{RpcModule, core::RpcResult}; diff --git a/crates/iota-json-rpc/src/governance_api.rs b/crates/iota-json-rpc/src/governance_api.rs index 854a73b588f..a59038ebe02 100644 --- a/crates/iota-json-rpc/src/governance_api.rs +++ b/crates/iota-json-rpc/src/governance_api.rs @@ -29,7 +29,7 @@ use iota_types::{ get_validator_from_table, iota_system_state_summary::IotaSystemStateSummary, }, object::{Object, ObjectRead}, - timelock::timelocked_staked_iota::TimelockedStakedIota, + timelock::timelocked_staked_iota::{TimelockedStakedIota, TimelockedStakedIotaTrait}, }; use itertools::Itertools; use jsonrpsee::{RpcModule, core::RpcResult}; diff --git a/crates/iota-types/src/timelock/timelocked_staked_iota.rs b/crates/iota-types/src/timelock/timelocked_staked_iota.rs index d67e658b34e..67bc345c1a6 100644 --- a/crates/iota-types/src/timelock/timelocked_staked_iota.rs +++ b/crates/iota-types/src/timelock/timelocked_staked_iota.rs @@ -1,6 +1,7 @@ // Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 +use enum_dispatch::enum_dispatch; use move_core_types::{ident_str, identifier::IdentStr, language_storage::StructTag}; use serde::{Deserialize, Serialize}; @@ -17,17 +18,37 @@ use crate::{ pub const TIMELOCKED_STAKED_IOTA_MODULE_NAME: &IdentStr = ident_str!("timelocked_staking"); pub const TIMELOCKED_STAKED_IOTA_STRUCT_NAME: &IdentStr = ident_str!("TimelockedStakedIota"); -/// Rust version of the Move -/// stardust::timelocked_staked_iota::TimelockedStakedIota type. +/// This is the standard API that all inner TimelockedStakedIota object type +/// should implement. +#[enum_dispatch] +pub trait TimelockedStakedIotaTrait { + /// Get the TimelockedStakedIota's `id`. + fn id(&self) -> ObjectID; + + /// Get the wrapped StakedIota's `pool_id`. + fn pool_id(&self) -> ObjectID; + + /// Get the wrapped StakedIota's `activation_epoch`. + fn activation_epoch(&self) -> EpochId; + + /// Get the wrapped StakedIota's `request_epoch`. + fn request_epoch(&self) -> EpochId; + + /// Get the wrapped StakedIota's `principal`. + fn principal(&self) -> u64; + + /// Get the TimelockedStakedIota's `expiration_timestamp_ms`. + fn expiration_timestamp_ms(&self) -> u64; + + /// Get the TimelockedStakedIota's `label`. + fn label(&self) -> &Option; +} + #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct TimelockedStakedIota { - id: UID, - /// A self-custodial object holding the staked IOTA tokens. - staked_iota: StakedIota, - /// This is the epoch time stamp of when the lock expires. - expiration_timestamp_ms: u64, - /// Timelock related label. - label: Option, +#[enum_dispatch(TimelockedStakedIotaTrait)] +pub enum TimelockedStakedIota { + V1(TimelockedStakedIotaV1), + // Add other versions here } impl TimelockedStakedIota { @@ -48,45 +69,77 @@ impl TimelockedStakedIota { && s.name.as_ident_str() == TIMELOCKED_STAKED_IOTA_STRUCT_NAME && s.type_params.is_empty() } +} +impl TryFrom<&Object> for TimelockedStakedIota { + type Error = IotaError; + + fn try_from(object: &Object) -> Result { + // Try to convert to V1 + if let Ok(v1) = TimelockedStakedIotaV1::try_from(object) { + return Ok(TimelockedStakedIota::V1(v1)); + } + + // Add other versions here + + Err(IotaError::Type { + error: "Object is not a recognized TimelockedStakedIota version".to_string(), + }) + } +} + +/// Rust version of the Move +/// stardust::timelocked_staked_iota::TimelockedStakedIotaV1 type. +#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] +pub struct TimelockedStakedIotaV1 { + id: UID, + /// A self-custodial object holding the staked IOTA tokens. + staked_iota: StakedIota, + /// This is the epoch time stamp of when the lock expires. + expiration_timestamp_ms: u64, + /// Timelock related label. + label: Option, +} + +impl TimelockedStakedIotaTrait for TimelockedStakedIotaV1 { /// Get the TimelockedStakedIota's `id`. - pub fn id(&self) -> ObjectID { + fn id(&self) -> ObjectID { self.id.id.bytes } /// Get the wrapped StakedIota's `pool_id`. - pub fn pool_id(&self) -> ObjectID { + fn pool_id(&self) -> ObjectID { self.staked_iota.pool_id() } /// Get the wrapped StakedIota's `activation_epoch`. - pub fn activation_epoch(&self) -> EpochId { + fn activation_epoch(&self) -> EpochId { self.staked_iota.activation_epoch() } /// Get the wrapped StakedIota's `request_epoch`. - pub fn request_epoch(&self) -> EpochId { + fn request_epoch(&self) -> EpochId { // TODO: this might change when we implement warm up period. self.staked_iota.activation_epoch().saturating_sub(1) } /// Get the wrapped StakedIota's `principal`. - pub fn principal(&self) -> u64 { + fn principal(&self) -> u64 { self.staked_iota.principal() } /// Get the TimelockedStakedIota's `expiration_timestamp_ms`. - pub fn expiration_timestamp_ms(&self) -> u64 { + fn expiration_timestamp_ms(&self) -> u64 { self.expiration_timestamp_ms } - /// Get the TimelockedStakedIota's `label``. - pub fn label(&self) -> &Option { + /// Get the TimelockedStakedIota's `label`. + fn label(&self) -> &Option { &self.label } } -impl TryFrom<&Object> for TimelockedStakedIota { +impl TryFrom<&Object> for TimelockedStakedIotaV1 { type Error = IotaError; fn try_from(object: &Object) -> Result { match &object.data { From 984e6040d1cd5c08bc093de2d5bc3f052b670cc8 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Tue, 15 Oct 2024 21:46:10 +0800 Subject: [PATCH 25/62] refactor(iota-types): Wrap StakedIotaV1 with enum StakedIota --- crates/iota-genesis-builder/src/lib.rs | 2 +- crates/iota-graphql-rpc/src/types/stake.rs | 5 +- .../iota-indexer/src/apis/governance_api.rs | 2 +- crates/iota-json-rpc/src/governance_api.rs | 2 +- crates/iota-types/src/governance.rs | 69 ++++++++++++++++--- .../src/timelock/timelocked_staked_iota.rs | 2 +- crates/iota/src/genesis_inspector.rs | 2 +- 7 files changed, 67 insertions(+), 17 deletions(-) diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index a52a92f4b99..8418ea5f898 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -48,7 +48,7 @@ use iota_types::{ epoch_data::EpochData, event::Event, gas_coin::{GAS, GasCoin}, - governance::StakedIota, + governance::{StakedIota, StakedIotaTrait}, id::UID, in_memory_storage::InMemoryStorage, inner_temporary_store::InnerTemporaryStore, diff --git a/crates/iota-graphql-rpc/src/types/stake.rs b/crates/iota-graphql-rpc/src/types/stake.rs index f7e55cb659c..3aa157b504a 100644 --- a/crates/iota-graphql-rpc/src/types/stake.rs +++ b/crates/iota-graphql-rpc/src/types/stake.rs @@ -4,7 +4,10 @@ use async_graphql::{connection::Connection, *}; use iota_json_rpc_types::{Stake as RpcStakedIota, StakeStatus as RpcStakeStatus}; -use iota_types::{base_types::MoveObjectType, governance::StakedIota as NativeStakedIota}; +use iota_types::{ + base_types::MoveObjectType, + governance::{StakedIota as NativeStakedIota, StakedIotaTrait}, +}; use move_core_types::language_storage::StructTag; use crate::{ diff --git a/crates/iota-indexer/src/apis/governance_api.rs b/crates/iota-indexer/src/apis/governance_api.rs index 0a3448c0b22..928012b7297 100644 --- a/crates/iota-indexer/src/apis/governance_api.rs +++ b/crates/iota-indexer/src/apis/governance_api.rs @@ -17,7 +17,7 @@ use iota_open_rpc::Module; use iota_types::{ base_types::{IotaAddress, MoveObjectType, ObjectID}, committee::EpochId, - governance::StakedIota, + governance::{StakedIota, StakedIotaTrait}, iota_serde::BigInt, iota_system_state::{ PoolTokenExchangeRate, PoolTokenExchangeRateTrait, diff --git a/crates/iota-json-rpc/src/governance_api.rs b/crates/iota-json-rpc/src/governance_api.rs index a59038ebe02..977511b5d5d 100644 --- a/crates/iota-json-rpc/src/governance_api.rs +++ b/crates/iota-json-rpc/src/governance_api.rs @@ -21,7 +21,7 @@ use iota_types::{ committee::EpochId, dynamic_field::get_dynamic_field_from_store, error::{IotaError, UserInputError}, - governance::StakedIota, + governance::{StakedIota, StakedIotaTrait}, id::ID, iota_serde::BigInt, iota_system_state::{ diff --git a/crates/iota-types/src/governance.rs b/crates/iota-types/src/governance.rs index 3383f0d7451..d31d58f1c89 100644 --- a/crates/iota-types/src/governance.rs +++ b/crates/iota-types/src/governance.rs @@ -2,6 +2,7 @@ // Modifications Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 +use enum_dispatch::enum_dispatch; use move_core_types::{ident_str, identifier::IdentStr, language_storage::StructTag}; use serde::{Deserialize, Serialize}; @@ -50,12 +51,31 @@ pub const ADD_STAKE_MUL_COIN_FUN_NAME: &IdentStr = ident_str!("request_add_stake pub const ADD_STAKE_FUN_NAME: &IdentStr = ident_str!("request_add_stake"); pub const WITHDRAW_STAKE_FUN_NAME: &IdentStr = ident_str!("request_withdraw_stake"); +/// This is the standard API that all inner StakedIota object type +/// should implement. +#[enum_dispatch] +pub trait StakedIotaTrait { + /// Get the TimelockedStakedIota's `id`. + fn id(&self) -> ObjectID; + + /// Get the wrapped StakedIota's `pool_id`. + fn pool_id(&self) -> ObjectID; + + /// Get the wrapped StakedIota's `activation_epoch`. + fn activation_epoch(&self) -> EpochId; + + /// Get the wrapped StakedIota's `request_epoch`. + fn request_epoch(&self) -> EpochId; + + /// Get the wrapped StakedIota's `principal`. + fn principal(&self) -> u64; +} + #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct StakedIota { - id: UID, - pool_id: ID, - stake_activation_epoch: u64, - principal: Balance, +#[enum_dispatch(StakedIotaTrait)] +pub enum StakedIota { + V1(StakedIotaV1), + // Add other versions here } impl StakedIota { @@ -74,30 +94,57 @@ impl StakedIota { && s.name.as_ident_str() == STAKED_IOTA_STRUCT_NAME && s.type_params.is_empty() } +} + +impl TryFrom<&Object> for StakedIota { + type Error = IotaError; - pub fn id(&self) -> ObjectID { + fn try_from(object: &Object) -> Result { + // Try to convert to V1 + if let Ok(v1) = StakedIotaV1::try_from(object) { + return Ok(StakedIota::V1(v1)); + } + + // Add other versions here + + Err(IotaError::Type { + error: "Object is not a recognized TimelockedStakedIota version".to_string(), + }) + } +} + +#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] +pub struct StakedIotaV1 { + id: UID, + pool_id: ID, + stake_activation_epoch: u64, + principal: Balance, +} + +impl StakedIotaTrait for StakedIotaV1 { + fn id(&self) -> ObjectID { self.id.id.bytes } - pub fn pool_id(&self) -> ObjectID { + fn pool_id(&self) -> ObjectID { self.pool_id.bytes } - pub fn activation_epoch(&self) -> EpochId { + fn activation_epoch(&self) -> EpochId { self.stake_activation_epoch } - pub fn request_epoch(&self) -> EpochId { + fn request_epoch(&self) -> EpochId { // TODO: this might change when we implement warm up period. self.stake_activation_epoch.saturating_sub(1) } - pub fn principal(&self) -> u64 { + fn principal(&self) -> u64 { self.principal.value() } } -impl TryFrom<&Object> for StakedIota { +impl TryFrom<&Object> for StakedIotaV1 { type Error = IotaError; fn try_from(object: &Object) -> Result { match &object.data { diff --git a/crates/iota-types/src/timelock/timelocked_staked_iota.rs b/crates/iota-types/src/timelock/timelocked_staked_iota.rs index 67bc345c1a6..e7295cfaaf3 100644 --- a/crates/iota-types/src/timelock/timelocked_staked_iota.rs +++ b/crates/iota-types/src/timelock/timelocked_staked_iota.rs @@ -10,7 +10,7 @@ use crate::{ base_types::ObjectID, committee::EpochId, error::IotaError, - governance::StakedIota, + governance::{StakedIota, StakedIotaTrait}, id::UID, object::{Data, Object}, }; diff --git a/crates/iota/src/genesis_inspector.rs b/crates/iota/src/genesis_inspector.rs index 5944e61ff8b..50a9a7d123d 100644 --- a/crates/iota/src/genesis_inspector.rs +++ b/crates/iota/src/genesis_inspector.rs @@ -10,7 +10,7 @@ use iota_types::{ base_types::ObjectID, coin::CoinMetadata, gas_coin::{GasCoin, IotaTreasuryCap, NANOS_PER_IOTA}, - governance::StakedIota, + governance::{StakedIota, StakedIotaTrait}, iota_system_state::IotaValidatorGenesis, move_package::MovePackage, object::{MoveObject, Owner}, From d660f40cc2ae669a6d0c929c319441eaf62fe3ff Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 23 Oct 2024 20:11:26 +0800 Subject: [PATCH 26/62] feat(iota-framework): Rebuild binary files and snapshots --- ...000000000000000000000000000000000000000003 | Bin 43662 -> 43178 bytes crates/iota-framework-snapshot/manifest.json | 2 +- .../packages_compiled/iota-system | Bin 43565 -> 43081 bytes crates/iota-framework/published_api.txt | 43 ++++++------------ 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 b/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 index 98410e0ddd6208fc878b238a9840b630117bea1e..ca20500cedcb362b66f37d3733f40fcbf4e85ba5 100644 GIT binary patch delta 8742 zcma)C32+?8b^YBvGdnvoJG--3+#pU81VI1kq{41BqWi# zhNLKwq7F+OiLxY1mMlxQC0n)wUn$3`ic@x+s@Sn}xa?HfiJg>PcCJdwNu0z{@_r8h zVriAiEa7$c@9X#PKmA|#>Z!kyZ+%aGZk`gaMfIw>><6~}C4bnup8l3_ewXWN87xi9@K*Pc) zJYMLzGd0libH%4h!|!>sw6vvdtIQtbh+!VPBohB3UX%9IMvwJfqu;r1CcTfEzp_%1 zXQZF^Bo$I1(jrGfk|3z+A|X>MqLg70Sr&>i0m#?@WdMAE3I`zELO~+sn<0rp-y~_c z0GlBRP*xxWsYF3eP&$=KiG+hOqy<#cu}KNeA`dyC$cfS=!8u(LwvbBMYPzhHut``L zf&VckoFr{XqIWDxa5Y3i$OKw>x*Y@haJSjE3x>ug^mgAndV1r@JH}znv+a)yOJ!A| z@}f+~3xX!!>Ua*TnCw~7hnd+(1@vz8D z;CK=6(0B%T_Y-0e$%EUJFv8>mFG3m5SvHU%=ZY9uMQ-D85q!e!QoWq49p2B$`jG>i z>^!76Ie1y9gD9^taM#U=kK!M&drb(rYGI{yx1`p84|l>Uf#=zdBMep=jjKV_QN zZ=g)uhLw~#e6Wmyhg61w#{@Pyz*c1_+deTUD7$JW<83>NfMaR`cvTD{DQMgUQNh8B zSR@skkAAS~dYDbv9!?I0gURMRPE(tZvH*vYCoP*SJIhj(3?!y&V&8SQjP8~}h0sEq z`^MF7N}4W?Vm{l@7VU9(s>HOIyF(;G438rgh(Qy=avfN{# z5$9MF3;_|UOyOc1r)tf(wPOlLAJAcdV{$!zsZlwpx+ zg)x;UXG&T_g@_SPzy@G7ID}-CgVP)p3SAK|u(X*m91}HYp{zJ@R2a81xFb4E8PE3O zhLBj(oh=9Jf=UTXsn|-`o-EFM*o&1D5GE-pU>;aKF;&tM*euEI>_TbspAr}}ZW|g> zVBDG3QagdL3l*Bftn2|d#u7;mThJeqzyx|+#5Pm0^|5(Hm`5by1T%7=vmmi8)S0M* z`((9yz_{#TSv!RCmYoq66i@IUW@b72lum-5mevQ4DO2-dEl`6Eq83j+OG3!`C>$uJAV#@4l@!6x(Xq z#qcA{3x`UBOJP}3sAu@g!hY<~ ziCy?Am+>7{!X~C#X&XX1%hX4O8LB6RdPk^v>MnKKPG1*}`5bm!DqZ_D&Nn5Enf%D) zx3~YDBUJSH1Aijq<&>~w7 zt83zdWkiV;=64dmvJzkSzfx)cchj)-*UiVAZ?ueg?<{&Vllsf<#`JsL2Cb51vRqcm zM!7<6k=y0n@&Wmv{5@zb=p@}m9~bn7pic?0ReS+4739ris;)r65Kn|5qGN|sp=FSz z5@e@vqCn>OlH7tRR+rPP&IYSvM(2RhWev)tJ<4Px1p!!HLbJMRW_2}8>JBjdzr_OV zPXG=w+-3ugG2EI2+{v()>D@lhrI3bGKG9Gb!iO04WB?(<2oLj;2!JnWd{HCF9wZ;p z_=v_=G+x&DQH@tLzNYc2##coay&lu}F)evqWB9U89@SV<09Dp8X`EkFOth0>f?<&f zSirfrL9{E9Go-k7%zLDH<)TTJGLTYNI_zrC0e zy+<%ma`2c5@^z%Sh1{y%Ze~#R=6p_Cdk=BawtfRA%lb`DcCX)p#H-ra4Ng^W_5qiL z0~p-v+03Hdn>c@b9V+~ieLndE{yg&U*<$y8Hofq4H z7c^ef_^`%HVkhKJ==_r!pVIgtjZZU%>1TA|n#M@uvl^e%ov-Ws^BOxy2ML>FA%kI}TS;uy>_P!Txsi zIM5mb4|V`av<%d5tl!+SwPkzDww6uxD;l~QmN#@CSk|z97_4w$ctib`mfnUd zqWH2XZd%o_?vAAm2^&-+;~F@j5lg}J9GtrdtNc$FD1(dXwZfuk^-(Kym<}Q+JDgYu z$T|tQsX)AN5YS`hhk%ZOd?bjTeEhpPxDtfi()Q6*#B-u(*@20GhUn!Yc6rQJ&`dc7GWK%&r}V@F{Y^KlI2#bOTd7UayR=VMhN7Ez%4W2%C9;RS3W zCWaZ7aUPLQ=K@eqmSmanFpJKh28}XP;SzQ&F!kD|M$#t4`U*^tVOS1J!rUMQOx{?% zP?H~44s{5-Y}^|JXsW;r1uP3)xJ^tCIEVPmL&j_^uGF1bBPhU$BN;)}SP3MoGjA2h zx!$CZ{VCoJjkB_#iwP9Q{Ygz50aa zCT|M05S}YD^VLo@p;p_8&w*dwWv920n5?kJ_p9e1g7 z>XbU8POE#>eQJ){s0bmsrrZ^d72NCDz8#$Q68tI|;E$<5u)rnPc4aUaeddAMwk28I z#?i%eT>>wN|GC1IE_TE1wXUV$Tndko72yAdu<5@Y_< z8VCx)mXtPwwB(m8)A{Y1j7-DsJ!T_<(21xr>^JciL_N`1I7gg_E{E-5z&*9Lj%d*< z*dwzno4u&RvfyUX?J{?>=#VVDS#(?$L9{)iHIu;^57!A8Y1CCMp5bD3A=ZDFEWWwl z0a@~X{f^A^)7?sM?skjBJIxK%&tR&fvV69Px9C<`F(V4Gi`?u^IcG)&5jPu_l@M(Y zwC)PJ8;-&I7mT?^3vXbCTocMyamRSS6?a67+hjF&y?NQk^3|_Fn@xFk9+9>0*YA$} zesw(I?Cm)y=R!0XUAS;j%!`bR`{tg~zJF18fnVI^dj)QZTTtwk!ucqjDb$sxqYD=+ z{2l>G)-@cyIkKbbyIF8E2BTZIBd>?#~h57KHMtSL`NU)3VVdP#FfHD z7{gKO8nT}C;obCdlHV+KK9iIDbgA>Xoa7fw1ZXAs6;lhXoaDDm{RETT zYFRy`?)k1VzG-C4?;HQ95?{Cf&9}c$JZwE%GT{8U#P)tx@@p$h{kY0V|Fp`WT3IAZ zacirQ4YFJI$hERp?x#9hMSEzkSU?8e-3ULI;2g%45HIAC44lN+2Qu-BZh7%74dIlM zDM?Nc-_%^(>|ET>Jlxeh+|^PUgM8f6(((N)EaMAW8^}K`=5@6)v@>+_PcthRI&hz$ z&+s(m)db1=6SekTj=;O{y>lnJY?^b9?n;Et+3^8nD=wsNyu%2P37XmkM zb{E3{!(a-qkzqF%H!*By=x1p3aR_EJ2vdbwOgt}x$Nc(C4)5v=^9%7FzAu9-R#m2i zWJOam?n=2i;1Gr?UfRV;N#_!N$zIqXglDe|tFgDqW%cvP%@zc>-xd^;TiD@{TUJ(1 zZlx%}{iy)ZxER5vsTFsn<^>6ITN(kab$pSk0km^&aV?-@9-wnBV96qk(#5jnEL*{{ z)jZTX9;L4h(BD=HT+i7J3>(`41DxB`7CnD?{wgl-;__~WAwY9Qb7fmqYocjkYs;dF zmdd1U*@gqQg>`_3;SmlDEy;HRnz|E2jaU4&_+bVT{3Sun2riB%DHP%x06ALV2Kok& zs{v7)4lmF0u3PGPVrr2 zY625;xv+^|#gu(`GOh-dj(+mk;twQ%wKoyK_v3btUG2~R4ep0mFN?_|PyB@u^*-}Y zRn@k2KvS*K3XUbyWXZLIC7u&3jkaCe9Ilo)Xh`6=3g+YJ?2-8Ogh{L}wgjuBkyq}P z=BzT}(^_fe3;OxF2KR<|1Xs2MYovXXq)#SUg145aEb_wkF8qRuuj@u95S$g2E)`($;#V4JMT7wnR?`GNt7bLfT{ zmr0yC2o>1C`e3o-*q@t&spfmG<6y56ss`7tjO#|V&sB=fXw7pKVGcYsO^D7S*JXK# zc`ddecSRpHV z)WJ*A_*+?F{ziTi(b0M-VgD$V8@9gY=bZ2Pf%jAYEi3gzp_RTix$ycamCAcYj^2Es zwykK_*oo2O_Ku&N7(F|oc5hsl_g?((FZ{73qUdX{Ru%rjwlAlK pt)HhVok#rr-rxBDtWw{e{MT2{%Yyg&&@a9|kpH27|Mjm}{|{KLVSoaDTh|?d#ibzuo=q9^U-6y!9RV?kq(wM6*?8>EAleyNO=wcJOE9{zJ0ee?ENO zi~m7+dGP(wUiC{^pWQY%cxvb1$^L=P3x|*Q4IJy=(Kp=hb`STR>_4)8aJbLo=!t=2 zTyFH1)#}j?qW8kevNtl$r>6BTAM`nvJk^%QL^T3H_J={t4eNZ;__P&gjj+&|n0QD5}e9l6mzEILz?|B3%f`A
!MnZ`Igz3yWd%tg zq!c8evX4MmQVEeTOd)IwNo4~<2VfY0fRNz<$j_3I%UhGdJ6jF$8p%poC6~!v@}#^V zpCb7*$rnhzNb*gRpC@sf#LFaJCGj~D?+~4)w=h8XLjX@mI)D(rRMgqJFrTv}yg>Lx zHYpLeY!P>S5s&#I0iO@zz6jD%B(sJ{nd~^?D7(~0U`-*ekpX;!OyD#N@KLgXSILP9 zaf4h>i0eAD!iV@JiUXSyfCWKPi06ng{}~Dqd|KmYHNH+^N{EkBkQU-hCM(1VE_hFv z6JnnQ*jogsFM@18C+8I-wzi~Hh?QmKLaeF)Y@9Y-h)tD{t*HWRodMWv1GX@1E2|cw zb0(lG%mdelfVXMZY#}bzC?Ou21DI6{xKsytoaO=_oCla$kG{$q5Sufd$ z(v3x6Za&rPkD@abUp|l(@%#6rL?U0jS&2k>DPVSWQY7YcvhfA@VxpOat68|AdO#$4s@p_j z&;2=(I9LrhRh<`!;ZM>_BoYrk!R4>g?wCkiCvM>e9q>fr3F6vMQZ+jIgpR+%7#zPm zTLhn^%a=sZ{RMjPl1MhJT_=)F>z0dT|Nc@D=2cRJj}j(2gmsc4wQ#tbL~6wj#@_8Y z;C*Ts_!xB~NYC8~QTo7D3{s>=qCaVSCZD#QI62rh9pP|XU^f#8S%9r9j=fA+PMW1i z83;_zBFEO%LR~FH25F(gbqm>E0vj_nZQc=4*5c+6yCdf65K$h@V>1StuFuID%@s!q3;cO{%zy@G7_^?SU7iR!66sqE6!O+Ira82Z( zgt7{OtMY|X23JI-G2=P$LP1EZJC!XL1Ic~u?3T9KVsssPQ zv7AQV1y?8x0zK%7;Q?`+Lw2;NadkG2D9q(DvbnVR$%7OJwBQKPEd(f~wdVkq)`L$$ zaW)=TXIY_NE#bb{>tezzj2{|e&S3}xJtE*=e#}U46_jS@vrG#c&3FL=En-S}4&jIR zfs|w<2C2D)QYH%wjNdX{)8++LSXR($Yzkpx%wGUK3WgYqp#Wleo(@)*99D~o4i6&E zarA7U5ycs3oIR4;cTKp{oyK*$$TwW}YW&lU7?=q?jXYJRp`#cm&oEqz155%hk#vpD zbMypa8qp;?aT@-U1j)j%&>MFg{d;@WvJYp)@ohsV28T`zU)+AK|J-ll$kE1*4l0VC z=qQSAb(Bz3^tq0Fyu?0LS^#no2+a9H~-tKL8s!=|NY0oL3PhV}}l$+$)^M znwbuRn5qr4Bx9}WQ)FHtb&J$&HKfiu$!EzmpMgtBcT(OvcW1*pboP_j=nQFa+%h?F zX!ORm_gylgQ~TZ{HQKy?l|gd!fnJl$cClN$7>)FmXTCzt@5xo}uVmmqruM}DRT;sL zqc8S7jLR6YSHp4Phx;IDs#1W2tG5@#@UZpe|dQ9V|wd7+OU)Fd-V`&D;bY(%hYKw}6*vW97VSxph%dsy| z39z^beDG~5DHGtyMPQCgIB!u&1(+(w7Bh4+n=C5IR|?Tk6$siicb<^5>u{NpYjzg{ z2Yc&)U#5FF@eS(X)bEmoK+QkZ23+2TxKYz(f!|ohQ&vY}aWE z9P9*0rB~Itnu*jLYYqoZo&6jvT)#o)5iVP2adP+itqA<8jjO?}=2&Zi%Qm5LzkLf! zc5mkRKo{hR(tUwQYzk(J#D)FEph|#X(}D&OY~E&xpl=!AzU6?E9J@-}fsbhXh{lg< zyhb}Mkq>U^#1k5CYkX4U$2CS8pVIiW#%DA>%aw!Ybo>(FtX*5Pqj6)+hMLWdTN}4GZfo4Mxn_Co(%NOUs}8i*t~>N7HEuk#zGh3~n%bLG ze1nQt)OH?kskNP$>!f&h#$L{Z4;!Gw>B@gP!6!!2c2xB3W94})XG9_Az`|u;2jBq+ zIgN8&c{bX@xsHaC2$ZV@9@sStxulasQB4%NEk1utVDuCpXUnkB@&i%?k-8IpAfe!et5!gJaQx z_HZ1B8VZ!9>9*9fOH7cRD78HZeBu9j0P{d+51Q>?ryv$8wlLGRKAbZo!;m zZLoLihS=N=){19OhmP#!TGJc{@OE$?6pQhSipow_TN&foL_Koc<|u)rs(z) z#iKvEuu|sjI<;1eRXqh^0){s-5b*TIIw>ap^kigxej_qdu>f zEBojXI;PFsukpA#s^)Tg>cc8hq2j^9_VF8P8q(t~d(1v}Apb<05 zJaVn@g6|}p@T|`Spz!CZu+9^nMm^yN!4@=H<@uZG|_crNnDlb-Sn4;~UON#Pk2 z8TE@jk(PeaSAN_NeBV#_o}cku-|<5~=Nsh5u=zP@;oE-7&-!WK@=af&t(b+UQ2mD{ zb6)64CQ=0fdhpU-)|-{`>=b#fm+?F=;rU+R#i2qn1y+g98%o`vA?%9YyInrd4Z_`i z(i4I3l3ox#Ecx}zGPQuhJe(cL5?A2q;9|7(q3ZlYk{`va=~{GVbpt|58kyNfX`#?q zdZv*vOFcL_b|6(V*4$+r8ek)V%iWPp;dR1pj6_1k!t>BjhI=Hx=y>AFgFG=`7Li! zvm+$=Vb99($XppdU|43mKQ<_%W^5D!Dq@C3V1`M_Z;_V!!JJUy=}ffOB}6z7eevNg zGvs9StA{ISAS%7wluvO*t*lE8dI0y}g%`5PW9pZgyG4g(_HNM;nY&wbS{6aHBdHaW z;joX}8EkaaQw_f1VRU(ne@GVJU2nfE`LKG&$Lr~8c+#4x=e@FQvS=7xosi{|MLa_X zWyQFNr|bZzQNCRcREN zZk#$BeGG|LMQ3;oi#TrZCfAZSQJtUzzb212g@^U|ce)YbRg#T&QeN007a&m){rA-w ztD5eJQ{gVTa3awo7jdGnRw;Z?@{_byT7-kL8TL3<9~Yg+qdku-&v&(ynlsrRc1xLO z`pTTE6WC|4`5DT>!>$6ua8!cV0KUY;K@SA(m>@i$gEro$VoHieu|m9BHR)>zUh8|s8{AKqIR0BDqjo<2PnAaSex-q%XOS$$?RbW) zm8)gDTq8T>0Wnjo6nn)!suKp@G6i3ICGoY_K&J+-yF87p}gxZ-`hz3O7}_ z{(87Od)V?lTzq|8f^lYucxZ@35??hO8}}(8%J}BH5SJ;j7*Fz|iD41L68<>W#?Wj6 zmNU%f?`I3}jYKr^_p_E5U}?<7G2tQB#n8%iw?Rv>g<&hhJq+6!)-rT6toJF8iz!Dp zF!V5NV%QZ2Y-HHY$;}Kq7}hb&l5nehS3NMo`5?*eR zE4;GOGT}|9V&PS$0dp7PIBICb6?A^BExg7$KvOkeP^$ooIJS5Opm`Qx$xJ}Ye6-Ta zvgIsmW7#Ths;iWnS-SwRj$u8+28NAIQSG&wZ5-Xnu&W8s!?E2A_b}`!YZ3M3_0yWB zFRHAfTOF9AP7Ft9SBslt?Yt@v9Dz49{^Yv|oU)%YO(Q}#e^3Bij zP<4tX(TVGoue_TPn@7>WZ`tkLu-M$k{ z)aGlR&v!c>6(TxX=)lBnkH4epA&gmuZJ_(tR}8+6@Dn#*)ck1MjfMX&{Q3jzIV`Z} zohMF5KfAGf5@{Z7zImOZ+h>YL|LV~{Hl}dp|1hc?>)vSOcFtVlyJ1W8;_XfOl^~V) z9E*K0ticYwTH;d|-+OejAzUGiDd|L+q2A&EhB#S> zyz4+aC{tzBn)O)AHo<>1VPS7i3R||sWF5L0Q*E)Fi;t3bQcJlX64OM7crP-Zsw{ch zcD@_$wZ59jxPOrd{U0RWwBpyYR`B>}+f!%ofoI~s&P3mMc1C>$OSAvf;9>lCnu(m) z&I=ub1H=6nhSje1YbI{Gqw(kd)S@S%@4PfU`y*U*)VzS|KgReS^o#k6+sgK diff --git a/crates/iota-framework-snapshot/manifest.json b/crates/iota-framework-snapshot/manifest.json index f69565127b5..01e27b8dc2d 100644 --- a/crates/iota-framework-snapshot/manifest.json +++ b/crates/iota-framework-snapshot/manifest.json @@ -1,6 +1,6 @@ { "1": { - "git_revision": "62fb88d16beb", + "git_revision": "ae8fbd10da06", "package_ids": [ "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002", diff --git a/crates/iota-framework/packages_compiled/iota-system b/crates/iota-framework/packages_compiled/iota-system index ef74ce27f15db969bc16dbf064bd4d0b1846feeb..48bf560bfc95fd13828fca05a72d0a67007600af 100644 GIT binary patch delta 8744 zcma)C32+t1nf|+bX5PG+dGp@9_jC)LAcR0d0tDie039H11md(U0Wx3?VUQ1eFo3ba z_=K@>e8t9&oy3WqY?QOM)>WIWWRtDktW%p!rM5QCv8kl8cWtF=v)NtOet(Yydc>7l z%KEzd@9Xcs|LOnhet!1{^1C0%FPchRk1SPF{v+G|sy}31OMgc=A7)m0uLp0rsc%(Q zrhhixrT$xrlISN#ilz;=c>`m^M@9~;9UU7UY)f(B@bQD2M@Nqiwv8XMmblA)x#D`| zKe-kWd4g(X?HYCXFAd`>W~2FI^CctkpULsO{Z7@8b-DU|;e4m&72*A&_J1o_Z;_Nq!|IgG>bxCJYZgBYM;RC~CqbE0vj140L4U3{Xjuv_D zjT&hAY{`kT@cZ5rEp2JrDzn2lXqZPXh{V5%>(YMK=(0XAdYx-#(tFMPjg^W#BmIIW zsfYrR7I_kq1VL3737Jw6r3{nEvQU%>K*k0r1KPYb zlC&m?-mxgb)es3G6KLh>b`0pl-KN?u7#tnb+kM~2$+gGt9ECM^&U->wDyxc=7ybME z7X^)9Uhq6tFM&DR;ws7nEI}VEQk2g)(x^~%qLcJy4w2bd0o)+d0?JLQ|uYxP3_HSnm zSwCv}GvT~E=csqF`RBE%UvJE$|7)W`ZwOf}YvdBSP2MH%laY|m3Hg$cFAMouA>R@7 zjG#{nx-RI`g5DG2sQ4V#z)p!h&L}_-bu5`579}M1mb_vZl2TTJQnp8_q(^?8}0~-iFR9nT_u1yC6Mjm;_Oo7ddtd* zR#a3Hbxs5HS5*_OtAT8FEns6EV0{9xfnifcJyG{`Ku-_?*93rf#f%1``)4Ym2O9y? zX8|5)0z4sR15eKZ)Hh?UiWcN%&TS=XY@0_kYd+>`SO8eij*3MK0ary88kVJ-iH2D3 z+ZF*z)ALA-Ea@f*2UBp6C&ed3_#(Vaent#t@X0J3fNPtZPi2K|jofuaNbAl+hk^GV zJp{KdUxAOrNYwW3=A>@j9!{Eii#ZutvXqmvV%>VAcJ0Yi!m#V^KMm|y(h1xW*@FpdUF!|6+P{wl>_h-ntB>I<=+cZ=RpKv?WYED)S?dGI!cn>FA_bX2J zUKF~`zKi0LV8K`<_HlYv40Gx=JuZsz84f&$dZc@w(8aUjGA2{0rN@gXbz)bR{IFz$ zBEO;>Frz+0ehU}pz6@XV+gaGf!nO6s$=_bTocx`47n6T`J>W=vNdBo;1$^8;{S3E1 zCw3&se@yTQ7sYKZ`A-Y({j8|RM4!<4_ZZU$&oof_6>;W4N)LQqJn$f8n)}vJrftnK z${g5RPQe+Kq2O_WjSjF?8OqKZ8xWLTzLoKgEycjYY7BT;3?RuhZG$Mc_dFI!xwFyN zmtPCB3ERWTp>QzSoX2Tu6H*r7Q1YZ@lVxXFijslEbWQBL?v~NrGN=$*Xmj7V+D%E* z#Zk;>8``2h4o{Vs6mxfoM2O*W!~!vBLRhXN?SvW678jMB#$k!0ILm5St}EgkYl0yl zLX|08Y~w_&8Mk&!;ppQ!YqFZAV6^PKz(JeU5~&g)i*i!fd6rC7&qNs(nN%24dGba{ zYp4)0;tALQtOkdWta5Ogqe7u8;sus=V+_Yc4O%EGP8=1+tqksnP7}tny|^JH)?{bP z!MdPQ!cr=>61FFcGavS1Znv;;Owayz?7n*65(294W>h7=h0Mr)~^ zK-fhJ&0$vdfSY59B!?~Nk4azxJuYIKso471ykg8F5^;hVInY^<*cR$c)WLnS+C5-g z_OPrSLV3&12n&iQ_zyF)oPEl6V&f>7O~I-*{0G4{i@9T0h!=qw^v3XlIM1neG|uoJ z0yvb!UO0}cBeRPJ_{VM#>TP4ORL~R|AUERzcgJ!#f$6n10<46s$^BUtE21SlIlEz! z%-A4M8BPGp7}zl+{5N4VxDFb_8AD;27EYcU4GfHkJ?2e?W8yC%;GbBvrVUD&EP%z8 zWjbbpzp(f_gI*JRip63>edrNeW+I0MoWpupTVYFRrBulK30rdkGaDF0vA!6bEyLqG zCj4u1a6Ja<4Ts$v|LIW-Y>nPm-a8XC3tNtr@|MHbIKi&)Hxuu^tv3|gYS|_5Bg_kj zN`p&bS(uF{j{bgCZA?XHgZOSfd3f~X;jzl6>@yf-Y!Fk@mGdS(Y}%f>66AJ?{WoM((+Y)j?rbCYdRAb#n*)WzU*>7l4Y|2FhsQOKq|BhvQ&cX6iyV# z9AA=~n_zW$&FXBhI%aeZ7+uz&OxmMNMp6)f)g?5mt6^4G%cO1()BoEn!0rTKFT))+ z;0VL*Nx)qUJDJ|?@>~jODCH9krXf7TupyuWLPv zwy)#-(QZ`urMrCc`~4Z@-@Chn{QCjv{<(7~y>6pP={pt!4lMy3=GF-%|4g{vAPjn8R(UU$Bx^Dk)p1Y_naV&y6dil$dnP%?c! z1*JPo3d*(s>ZX@auy8>K1&bIu76Cd}bW+e?S5LuuuHAB=ih`ZXTncv2LytYJA#m>k zz-?`S+gUiY+^1l4dIbfixy$Fo3UIo2#R}xVpz*6>VLN5(4|jvYtvu8T($+N$>}y!o zxT3MQVM|MY!`g=REgM@lw`^)z*RZs)qj5=N=bpuleM4Y{{X=USHngm6yd+94ijq0Y z8@umZ)R?eAH8QS&6B@A;OwYl&i?GW7bb&Ism_|R%7e`fxtk7XTh^XvvVj&{yB;d9J z0mDH=kEtIbI!5x5Abj%q@8;o45OPb~M^h0`ilSu)CL$Wbmy6)#FOfFIjEaDQdE6x48X&+FvHr14*(sdO>ZYE&K7}v~ z%jjir+|3~*$p)<+kH|!Vi45lBAj*ry93U>pnNiIf)gcy<)BQ13E?#(!O~lMF!!phz z)ahIR?#YrYQy!+#8PuRrW+Gm~t~pb$ZDJ&CLaZ-mf(^rRSQ6$2D`57<>V=y9uyUwF z+-2k5WIz)IrYN9U=)!Gce!w{dXdW`AYjLIS%o;%fP8`VyuEt6rVV!xaz|Qq1h3ruA zZfKm61z${{s3+k>=dnAS2hGfJC2kbZG4_Vo6){0v0lUE*Y264zSxgn=4Crsi)}3%K?Xavw?93C~g&hP2V^?OgGDGH$ znW?s_F}1=@d=dQeZaclnrfupo`rBdO+9yV|W%p~mQyoyVxTBOVcig5aU2KSJx>m3-OJGijXys12CFqIvUag$tq=P{(<5HU3jGGP~0#(HjrWT0c3>Ynn zWe(v|e1G)v!}T=}V(%fU)}qmsbC8ORk#8`{CmMbDaAo)~d_)gaNQ{{iYal2HTTJR)lXrnL$YG3h_~o=S$RVgVi&pDU2@tD8ARM{NLE3#IncT*=x#U$ z?_Y4(HClKBGvu03zM4D6`>nVmTHGOPxa+OUK2oTDE!wOru=B92`?!907WS*>38!w) zUO642foS;Lc`+mU#kpP6PiWsiFTB7n>F~XrTk7UYyfQc+r87mk@?^}rOI6LRik$qiP?Run3u?hAEY zZIj|`uuaapS=cV;b7AtBIV~4V)=_X=w!;D=%_-`+GkW{NvaqM4+?>u9NOV-Vrl-u= zx_|=(?~#VE@Z64T5hxeG!Mnl}DSl$bFB>M|833mbA`X7*XrX0vy=Kattwz=is(U|B z#$Y?Pg{ zORkcu|$3GqTM$-qgBeIOIB=$04X(hyB4nUdrL@lDOe z&CbRB%)?#H!(A8!#sv|{%K|@!vfqVXbD3z|9UeQ zZ~4^1zuqiN0v0759QwHPQa3{f_uU8$X+6URhCzl+3_T2682T8tdLeKPXSXr*GYq5v zYZ?4p=xBqja!r3CotUYy}V1&7<_R z0eaiYfPI`@!?1Q9pr3Q=+M@d|&RovrZCu{YFbHU_Y_4jnZcWUY-P$s@vZX3%TejhV zY+)UsVR(cCK}+(TfF|z*k#oskg&;NrAu zDCp$}8(bXX5nS04td#aGk{+3430_;G-(B^>c^&u-72ns*PM|tVrORzVS6DID9(-pR zB4)tNJ+1>E1c{VE%8?xg∨Yl>G7D9H=E&Eq!h~u_9=^1hg@P?IUntluiwXq;62DbVRb#CznGl5W0)y?cw6MuKSym_*l;wqj^|GQ+ zuv1nR3O34VEV!{9u+aRk8`|Xl7g@R48wotH5))fl+B~GH7W?U?B>L6HP z0~><*lB0iq8m5}*xsHRqN~l`gyE3jD$>*y?dsO>;Wtaz3O%vj?$ah#CqFzhThp;a4 zwTNVSd_@TXXV4^oT{c4r*^!V<7sK32-gF17c9G=3^8 z&Hs_#MtrnhPS`(A<%g_4@$=62{lNRV|BjV)ML99X>X4 zbaX%dmy4fQ(>(xcSw(X0lA?sJED(6vu hxAznOUsdX_#=rmiS(*E|4}IU8{e>U;SKqwP`ajF%;qd?f delta 9227 zcmcgyX>?WBbw2x?JH31Fd-vVVjgR%Vp zI}ElHn_SO!JllyK$9AfuNjjvf&FX5r+SS#jL)yfvP2;ppla+S0&94lr{q}i619pD& zPqld8K4+h4pM9q9oXZD)A;0w3@_kd$^O2=0OTObc?nF&LPcoa`9pkQoe z>Kn%Yt)-~GaAjGnZ{Xzd!vmwkBjH47)8Oa;R0Gj_UD>gh3r`p4e&WAU_EXOiLii*c z>G&$M%Q#_}!w-@D-}IhzUNt(b9~wRG7tEypb@S&|{2kv2-uI=*iWDWOK#&wdNKxiJoP|w~XnoPpYCOW36RwUSwaPzar;vWQX;na^07d<-eg0$8Q)ic*Kw*K`tfX zYH7gRaEbDTqUil4m%`-4K<^qEIDL9>WNdlsQOf<-mMIM_mWxN#TlAV`{F(h3GQa2C zjM+a8-z;)&*7aNeS@$h+zcTLz`M=-r!>ag8Tav+hTMY3U$x2xzm&u*-ggh^wAo(Q8 z=SjXm@@Okjlt_!QZ|E9At4xK6Go z#5J8*?nC_|#eppez=9wt#52U0dy_(l*EN1#;~NyFg!n84X(3K$3WPY$8Semi=hKdAXzu(bA!-*i3sJWaZPhFS zEMAO+))qiS706f;Gzc-kcHg-KP#iQ1I?}dU$VJa$xd{1bdWLeCj6%LeeMu~?CB0Y# z=C(5_a;zhFogir)J$4*;&&gw045cfuoD6$r&mI=l8}_oO@5!<_(zcAnW!kV2(wRAO zh770r`~~3Bww1vB!&%_r;Uw_fqtpxWz!pVDE_VNOFvfS=)+dE~gVwhTuf9KvIpHl; zT`ao#_pn$yu$M*eA;n_7Ln6^v-7XTl@6L+E zfoj0X>YPZ7evV!wk+}CU&VPk=#YEy7aShjLzb6up5tqJ6)oAEh9e$57IQGCC5qypw zxF~|&FVVdhMY3_tT9IsCyIdp(_mzk+r;;Lkm@v>Gypt5Eg`>SBQY*GI_HWAq?^2_{ zN2nJfUB3gW^!_X8q)11t^PG4-BQ(~n!j_AE!6e60D(@u>PudaeFE);#jENY*J@C3c9@83lCC2%j ztTg$j2$kmZ=1fVbcOtjclYpG8LUy>7XTW4#6yw7V_M;KFK-U`+%2e!q3|=AHAv-V7 zA|H(ll3u%}>X+1sQT%KWRXAg|GoRBOSZu1W@Mwo@}R{5EjR#l^8&fF^(^3N-T4#@XXkNo z*5%vP8g7ecT}+ty{=-6yIUHf2MF{@o#+`(zg4{g$EYre9Gm*hSjTllML(D_`KuR(a zoz&byDU%fj`fr)8Y4d{0FDuwJK7{Zw#xH;!c}I+gkO83_4+on|4x7b9hdUAHFj_WH ziQ)uQ&NGthcTG&ETb1j2k#4v=tMN})VqhfnF!E5Dh7O{mJi?e-EHDVXMA9`n&Cvsh zVMLQWiPM-rNsugb3$1a((FdJX%RZSE$G46gA09bAdSTny!Lz@KBS-aJT~rticNIoM zUB%QKUGHkI@F!?Z@8IaiInEEdD*fCuq)O2K5S-+shh6nqUPc&=?OHh5S2&JEGXowm zRXc`B#@f`&WL_fm8B%l9h&tmWpC;FQ3Uf-jQ_|kMJsHzOC*Q3B z-1`BkvFyGMgXGw*ev`~ju}i!V4GffJzDmyT$qx5dGVmW!yW>AnM)2e4=D<@v z?h3;r14jpY&JG<$l~bg}61!#*^wfx?vfw*~`p-uwS$7%fSySoPTQQxBjs4 zg!|6?uaW;z({o|`*Q@G+&vzPPr7V->U~cndyWAqT%X{PlGAF-E^0!Hx7H7ogHD7y& zXe)hzpLuN@|S7Jk0Mq+^;%pzZJp?gwOoewwx+EM*HP@THA3Hz|czFwW|-n$^X? z>Rd274~#Blh-B!CBv@StN|?eP0#-MZSzR@gx;Kf?*nSgNkOMYgp98p)VIUU+o?_^C z0Vf&ucs^(uXrefn2*A>k&|MGpP#?#Bmn;Z1|71IGc{{>JO^*eBSFxu^nClM&!o2@*k+8duqn_B#Qx-_raj;6S zs(TePskzo%7R}v*EEcX?FLRK~)><6hwQdW9U$tQs$kkkH4RF~;RPJ|fX3efm93JX{ zK2fqa5Q&Y!9FaJ`uLxWT5Nuq~D1uE}EfEYX1KhP7aDqcuXdCcBjSp%3l*X&H!xFjR zGdl8^#>X|@)c9GAk;W%9KB@63jZbso;29l$R^xMw$*)t_Y7rLBt`uSM?8PE1*=>oi zv==aIc995MTiQgpl%Z`YU{yzMl?XRh&l2HgPVPN2Lxg))_#)i52u1cc1MX}A99RhG zXWhY-fe7!OT_(bdT;g5oC>7!R)PeACY5WGYE)l8OCwf5Ty6##9^456>xVEOfc4h6F zn(a*+YS!0mYTDAYt!Zo1#!WTLYnRq8tL@m|R=f7#!_>6l;JTX4O{;5fP|y3 z(;6qX6UwdHJgza%nwjTpK8b<46B-tTM+w zDbP*9s)D?a3fP;>B~z^9u#@3z@DbhYd+14fo-Z*uKpKv29tZ9p|8Sh=Bg}F@%us~$)h6YEnpQP+- z4p_ZoWN_fj*^vuf1E;Mmr$>(u4}CH*n*LlkK>;%Pwz^LbA3BEDrn=$obAv;p$-H*! zz{tR_`td5==5VnV}E>p zrOerNYK>Z_-X`^B!XuGtV4mdEskI+dOPQ=yJJdPV;l##p>pJ6v+Z@rSzNnWg&(Xtl zRJ(al<1uwa)pLF7lL}J4;DP-1@f%7S(&Hxk)J2fBvuadbQ1_`BYJ(D>5i?6Ya;@;Z z?1;HA9+Z+6PFQ{=f`#`C;{=X-${hY86PSS1>7EOCRzuqS%!@v?bt5bpAmo(P1O z^n&ny$H9}I-$jmWH@|nitvy6;c z;$f0w2U0cT)jfbi18gL4xjC{ayhhlK5lN_6cn%iIaJS^AyooGwN*0H+PM*KjuxT_A*I+ z*|W0TGgpT97?#=Tk9W$b8SjOFi5OuKm|;@#W2EJNJSCKPI}@FC2@wuOH}CH;Lykrt z-d|2b(J$_A&ZW4ZHrAy^-GMvs#0%ZjJ`Kvu?W#kv;C9tvnY~?gN)|%3J*f?o;i!-6 z8GLlaQ;ojip?5j-e?%7DUT&W({-kopCd%nzc+;A0=bf^2s%jKX9hYTORXjomWch@O zhn2IPkQEa;s5skzoB`GLP}{CxyWtuuqo3!l(46R=OS?DUtrx+A4Hge(tq+RQ-(PS6>}Y zW+XrU>To6_`3=~@YLxs8td&+q@@p_JeK?fDPmydue4x}7;bNa!L*GbHYpT*HG~GCL zH~HuiuZr&QDi(3v;7zVIZK62A27XSSs0uIZ^KUgH!Yd@3ZpFN?OD;g9Jo@gHnH|ly z)TwZ%TsRr&lZ!Z#U#k?}EBQ@Y8!f_N*#dtYZHSBRW6{zFm*;v~OUzm954*M0Gks;& z>j?H4Y<`Ba@UpAGFdUWOHGoesanJ*SJ0=JZ=%9@Us+f|ZNvsgBR!zAYSIWvg>fR5P z@weF7eq#Je+5h4^5jejn?6n9yA@W7%?w)@?qJx)u!fD7@?}&?~acCFA9SplmTSY@zLq+q91@^r9 z1&vK*4NK=QZLEml(a&(5Bo0$ta1>rUL33jQH!i_9uIR?qL?^Beh%#*jw-uQ4xYi&- zP5=Ss$qFx}?^iL-=>(jbuMts@;OOtKR#PJS_0^emzP_#Sb2~pWdMyNSLFwdTM96uHP z`Ss;fNb^|s#x;sgpDr4E_u)S>rg7z;8C8yTXEgA5)?DJdVQX~X;~R4;K`QY*7W-gW zgB^O6#J4WK_vmP2xI!A!;vLeQ6321aC9Ua-HT<~7ufDnlPd0{~(z#93BV()qkm3p#_6}J=x!ZJ` z<&5d&_Q=ZVimkG0x?-oCIbE?qVt1Q#W1GZIhO-C*I44{rXX7l%l%x3?-*a6a^{6MR zp_XVUD$6a#9+;#IpC0CTeikz9hw<8ZLzG!SIJwkrQ8mQ3ehD#h<+4R7C&h_-;MWM zUrS`%KTU-Ghl#hX_|*a{cyz4%iPQMPGx>jKqUWBT*^t4~96ULE2>+jEG9|X-eAn>M z=-~NLwR7F-$(!!j&z}Ahiyn)<`r?d&e|DS)(auNl3ionikN^F|zpMBMWB>NzB^iEf S7l`hAW&PB(|D9LvvHln9f Date: Wed, 23 Oct 2024 21:32:20 +0800 Subject: [PATCH 27/62] refactor(iota-types): Rename SimTestIotaSystemStateInner structures --- .../tests/protocol_version_tests.rs | 6 ++-- .../iota-types/src/iota_system_state/mod.rs | 36 +++++++++---------- .../simtest_iota_system_state_inner.rs | 12 +++---- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/crates/iota-e2e-tests/tests/protocol_version_tests.rs b/crates/iota-e2e-tests/tests/protocol_version_tests.rs index ba45057eb57..cce1d74a651 100644 --- a/crates/iota-e2e-tests/tests/protocol_version_tests.rs +++ b/crates/iota-e2e-tests/tests/protocol_version_tests.rs @@ -74,7 +74,7 @@ mod sim_only_tests { effects::{TransactionEffects, TransactionEffectsAPI}, id::ID, iota_system_state::{ - IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V2, IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V2, + IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1, IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V1, IOTA_SYSTEM_STATE_SIM_TEST_V1, IotaSystemState, IotaSystemStateTrait, epoch_start_iota_system_state::EpochStartSystemStateTrait, get_validator_from_table, }, @@ -893,7 +893,7 @@ mod sim_only_tests { let system_state = test_cluster.wait_for_epoch(Some(2)).await; assert_eq!( system_state.system_state_version(), - IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V2 + IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V1 ); assert!(matches!(system_state, IotaSystemState::SimTestShallowV2(_))); } @@ -946,7 +946,7 @@ mod sim_only_tests { let system_state = test_cluster.wait_for_epoch(Some(2)).await; assert_eq!( system_state.system_state_version(), - IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V2 + IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1 ); if let IotaSystemState::SimTestDeepV2(inner) = system_state { // Make sure we have 1 inactive validator for latter testing. diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index e9655b32a2e..c42ecd18819 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -35,8 +35,8 @@ pub mod iota_system_state_summary; mod simtest_iota_system_state_inner; #[cfg(msim)] use self::simtest_iota_system_state_inner::{ - SimTestIotaSystemStateInnerDeepV2, SimTestIotaSystemStateInnerShallowV2, - SimTestIotaSystemStateInnerV1, SimTestValidatorDeepV2, SimTestValidatorV1, + SimTestIotaSystemStateDeepV1, SimTestIotaSystemStateShallowV1, + SimTestIotaSystemStateV1, SimTestValidatorDeepV2, SimTestValidatorV1, }; const IOTA_SYSTEM_STATE_WRAPPER_STRUCT_NAME: &IdentStr = ident_str!("IotaSystemState"); @@ -48,9 +48,9 @@ pub const ADVANCE_EPOCH_SAFE_MODE_FUNCTION_NAME: &IdentStr = ident_str!("advance #[cfg(msim)] pub const IOTA_SYSTEM_STATE_SIM_TEST_V1: u64 = 18446744073709551605; // u64::MAX - 10 #[cfg(msim)] -pub const IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V2: u64 = 18446744073709551606; // u64::MAX - 9 +pub const IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V1: u64 = 18446744073709551606; // u64::MAX - 9 #[cfg(msim)] -pub const IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V2: u64 = 18446744073709551607; // u64::MAX - 8 +pub const IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1: u64 = 18446744073709551607; // u64::MAX - 8 /// Rust version of the Move iota::iota_system::IotaSystemState type /// This repreents the object with 0x5 ID. @@ -104,23 +104,23 @@ impl IotaSystemStateWrapper { } #[cfg(msim)] IOTA_SYSTEM_STATE_SIM_TEST_V1 => { - Self::advance_epoch_safe_mode_impl::( + Self::advance_epoch_safe_mode_impl::( move_object, params, protocol_config, ); } #[cfg(msim)] - IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V2 => { - Self::advance_epoch_safe_mode_impl::( + IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V1 => { + Self::advance_epoch_safe_mode_impl::( move_object, params, protocol_config, ); } #[cfg(msim)] - IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V2 => { - Self::advance_epoch_safe_mode_impl::( + IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1 => { + Self::advance_epoch_safe_mode_impl::( move_object, params, protocol_config, @@ -191,11 +191,11 @@ pub trait IotaSystemStateTrait { pub enum IotaSystemState { V1(IotaSystemStateV1), #[cfg(msim)] - SimTestV1(SimTestIotaSystemStateInnerV1), + SimTestV1(SimTestIotaSystemStateV1), #[cfg(msim)] - SimTestShallowV2(SimTestIotaSystemStateInnerShallowV2), + SimTestShallowV2(SimTestIotaSystemStateShallowV1), #[cfg(msim)] - SimTestDeepV2(SimTestIotaSystemStateInnerDeepV2), + SimTestDeepV2(SimTestIotaSystemStateDeepV1), } /// This is the fixed type used by genesis. @@ -256,7 +256,7 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result { - let result: SimTestIotaSystemStateInnerV1 = + let result: SimTestIotaSystemStateV1 = get_dynamic_field_from_store(object_store, id, &wrapper.version).map_err( |err| { IotaError::DynamicFieldRead(format!( @@ -268,8 +268,8 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result { - let result: SimTestIotaSystemStateInnerShallowV2 = + IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V1 => { + let result: SimTestIotaSystemStateShallowV1 = get_dynamic_field_from_store(object_store, id, &wrapper.version).map_err( |err| { IotaError::DynamicFieldRead(format!( @@ -281,8 +281,8 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result { - let result: SimTestIotaSystemStateInnerDeepV2 = + IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1 => { + let result: SimTestIotaSystemStateDeepV1 = get_dynamic_field_from_store(object_store, id, &wrapper.version).map_err( |err| { IotaError::DynamicFieldRead(format!( @@ -346,7 +346,7 @@ where Ok(validator.into_iota_validator_summary()) } #[cfg(msim)] - IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V2 => { + IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1 => { let validator: SimTestValidatorDeepV2 = get_dynamic_field_from_store(object_store, versioned.id.id.bytes, &version) .map_err(|err| { diff --git a/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs b/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs index e13ded15b88..fbd75a367d1 100644 --- a/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs +++ b/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs @@ -23,7 +23,7 @@ use crate::{ }; #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct SimTestIotaSystemStateInnerV1 { +pub struct SimTestIotaSystemStateV1 { pub epoch: u64, pub protocol_version: u64, pub system_state_version: u64, @@ -126,7 +126,7 @@ impl VerifiedSimTestValidatorMetadataV1 { } } -impl IotaSystemStateTrait for SimTestIotaSystemStateInnerV1 { +impl IotaSystemStateTrait for SimTestIotaSystemStateV1 { fn epoch(&self) -> u64 { self.epoch } @@ -225,7 +225,7 @@ impl IotaSystemStateTrait for SimTestIotaSystemStateInnerV1 { } #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct SimTestIotaSystemStateInnerShallowV2 { +pub struct SimTestIotaSystemStateShallowV1 { pub new_dummy_field: u64, pub epoch: u64, pub protocol_version: u64, @@ -239,7 +239,7 @@ pub struct SimTestIotaSystemStateInnerShallowV2 { pub extra_fields: Bag, } -impl IotaSystemStateTrait for SimTestIotaSystemStateInnerShallowV2 { +impl IotaSystemStateTrait for SimTestIotaSystemStateShallowV1 { fn epoch(&self) -> u64 { self.epoch } @@ -367,7 +367,7 @@ impl SimTestValidatorDeepV2 { } #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct SimTestIotaSystemStateInnerDeepV2 { +pub struct SimTestIotaSystemStateDeepV1 { pub new_dummy_field: u64, pub epoch: u64, pub protocol_version: u64, @@ -381,7 +381,7 @@ pub struct SimTestIotaSystemStateInnerDeepV2 { pub extra_fields: Bag, } -impl IotaSystemStateTrait for SimTestIotaSystemStateInnerDeepV2 { +impl IotaSystemStateTrait for SimTestIotaSystemStateDeepV1 { fn epoch(&self) -> u64 { self.epoch } From 0ed0c635da523c792341717932ba80f5d7db896d Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Wed, 23 Oct 2024 22:00:04 +0800 Subject: [PATCH 28/62] chore(iota-types): Format codes --- crates/iota-types/src/iota_system_state/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index c42ecd18819..b2a8e12ead2 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -35,8 +35,8 @@ pub mod iota_system_state_summary; mod simtest_iota_system_state_inner; #[cfg(msim)] use self::simtest_iota_system_state_inner::{ - SimTestIotaSystemStateDeepV1, SimTestIotaSystemStateShallowV1, - SimTestIotaSystemStateV1, SimTestValidatorDeepV2, SimTestValidatorV1, + SimTestIotaSystemStateDeepV1, SimTestIotaSystemStateShallowV1, SimTestIotaSystemStateV1, + SimTestValidatorDeepV2, SimTestValidatorV1, }; const IOTA_SYSTEM_STATE_WRAPPER_STRUCT_NAME: &IdentStr = ident_str!("IotaSystemState"); From 67265301a9b70276b110157fab233608b5eba3b4 Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 18:15:38 +0200 Subject: [PATCH 29/62] Revert "refactor(iota-types): Wrap StakedIotaV1 with enum StakedIota" This reverts commit 984e6040d1cd5c08bc093de2d5bc3f052b670cc8. --- crates/iota-genesis-builder/src/lib.rs | 2 +- crates/iota-graphql-rpc/src/types/stake.rs | 5 +- .../iota-indexer/src/apis/governance_api.rs | 2 +- crates/iota-json-rpc/src/governance_api.rs | 2 +- crates/iota-types/src/governance.rs | 69 +++---------------- .../src/timelock/timelocked_staked_iota.rs | 2 +- crates/iota/src/genesis_inspector.rs | 2 +- 7 files changed, 17 insertions(+), 67 deletions(-) diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index 8418ea5f898..a52a92f4b99 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -48,7 +48,7 @@ use iota_types::{ epoch_data::EpochData, event::Event, gas_coin::{GAS, GasCoin}, - governance::{StakedIota, StakedIotaTrait}, + governance::StakedIota, id::UID, in_memory_storage::InMemoryStorage, inner_temporary_store::InnerTemporaryStore, diff --git a/crates/iota-graphql-rpc/src/types/stake.rs b/crates/iota-graphql-rpc/src/types/stake.rs index 3aa157b504a..f7e55cb659c 100644 --- a/crates/iota-graphql-rpc/src/types/stake.rs +++ b/crates/iota-graphql-rpc/src/types/stake.rs @@ -4,10 +4,7 @@ use async_graphql::{connection::Connection, *}; use iota_json_rpc_types::{Stake as RpcStakedIota, StakeStatus as RpcStakeStatus}; -use iota_types::{ - base_types::MoveObjectType, - governance::{StakedIota as NativeStakedIota, StakedIotaTrait}, -}; +use iota_types::{base_types::MoveObjectType, governance::StakedIota as NativeStakedIota}; use move_core_types::language_storage::StructTag; use crate::{ diff --git a/crates/iota-indexer/src/apis/governance_api.rs b/crates/iota-indexer/src/apis/governance_api.rs index 928012b7297..0a3448c0b22 100644 --- a/crates/iota-indexer/src/apis/governance_api.rs +++ b/crates/iota-indexer/src/apis/governance_api.rs @@ -17,7 +17,7 @@ use iota_open_rpc::Module; use iota_types::{ base_types::{IotaAddress, MoveObjectType, ObjectID}, committee::EpochId, - governance::{StakedIota, StakedIotaTrait}, + governance::StakedIota, iota_serde::BigInt, iota_system_state::{ PoolTokenExchangeRate, PoolTokenExchangeRateTrait, diff --git a/crates/iota-json-rpc/src/governance_api.rs b/crates/iota-json-rpc/src/governance_api.rs index 977511b5d5d..a59038ebe02 100644 --- a/crates/iota-json-rpc/src/governance_api.rs +++ b/crates/iota-json-rpc/src/governance_api.rs @@ -21,7 +21,7 @@ use iota_types::{ committee::EpochId, dynamic_field::get_dynamic_field_from_store, error::{IotaError, UserInputError}, - governance::{StakedIota, StakedIotaTrait}, + governance::StakedIota, id::ID, iota_serde::BigInt, iota_system_state::{ diff --git a/crates/iota-types/src/governance.rs b/crates/iota-types/src/governance.rs index d31d58f1c89..3383f0d7451 100644 --- a/crates/iota-types/src/governance.rs +++ b/crates/iota-types/src/governance.rs @@ -2,7 +2,6 @@ // Modifications Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -use enum_dispatch::enum_dispatch; use move_core_types::{ident_str, identifier::IdentStr, language_storage::StructTag}; use serde::{Deserialize, Serialize}; @@ -51,31 +50,12 @@ pub const ADD_STAKE_MUL_COIN_FUN_NAME: &IdentStr = ident_str!("request_add_stake pub const ADD_STAKE_FUN_NAME: &IdentStr = ident_str!("request_add_stake"); pub const WITHDRAW_STAKE_FUN_NAME: &IdentStr = ident_str!("request_withdraw_stake"); -/// This is the standard API that all inner StakedIota object type -/// should implement. -#[enum_dispatch] -pub trait StakedIotaTrait { - /// Get the TimelockedStakedIota's `id`. - fn id(&self) -> ObjectID; - - /// Get the wrapped StakedIota's `pool_id`. - fn pool_id(&self) -> ObjectID; - - /// Get the wrapped StakedIota's `activation_epoch`. - fn activation_epoch(&self) -> EpochId; - - /// Get the wrapped StakedIota's `request_epoch`. - fn request_epoch(&self) -> EpochId; - - /// Get the wrapped StakedIota's `principal`. - fn principal(&self) -> u64; -} - #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -#[enum_dispatch(StakedIotaTrait)] -pub enum StakedIota { - V1(StakedIotaV1), - // Add other versions here +pub struct StakedIota { + id: UID, + pool_id: ID, + stake_activation_epoch: u64, + principal: Balance, } impl StakedIota { @@ -94,57 +74,30 @@ impl StakedIota { && s.name.as_ident_str() == STAKED_IOTA_STRUCT_NAME && s.type_params.is_empty() } -} - -impl TryFrom<&Object> for StakedIota { - type Error = IotaError; - fn try_from(object: &Object) -> Result { - // Try to convert to V1 - if let Ok(v1) = StakedIotaV1::try_from(object) { - return Ok(StakedIota::V1(v1)); - } - - // Add other versions here - - Err(IotaError::Type { - error: "Object is not a recognized TimelockedStakedIota version".to_string(), - }) - } -} - -#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct StakedIotaV1 { - id: UID, - pool_id: ID, - stake_activation_epoch: u64, - principal: Balance, -} - -impl StakedIotaTrait for StakedIotaV1 { - fn id(&self) -> ObjectID { + pub fn id(&self) -> ObjectID { self.id.id.bytes } - fn pool_id(&self) -> ObjectID { + pub fn pool_id(&self) -> ObjectID { self.pool_id.bytes } - fn activation_epoch(&self) -> EpochId { + pub fn activation_epoch(&self) -> EpochId { self.stake_activation_epoch } - fn request_epoch(&self) -> EpochId { + pub fn request_epoch(&self) -> EpochId { // TODO: this might change when we implement warm up period. self.stake_activation_epoch.saturating_sub(1) } - fn principal(&self) -> u64 { + pub fn principal(&self) -> u64 { self.principal.value() } } -impl TryFrom<&Object> for StakedIotaV1 { +impl TryFrom<&Object> for StakedIota { type Error = IotaError; fn try_from(object: &Object) -> Result { match &object.data { diff --git a/crates/iota-types/src/timelock/timelocked_staked_iota.rs b/crates/iota-types/src/timelock/timelocked_staked_iota.rs index e7295cfaaf3..67bc345c1a6 100644 --- a/crates/iota-types/src/timelock/timelocked_staked_iota.rs +++ b/crates/iota-types/src/timelock/timelocked_staked_iota.rs @@ -10,7 +10,7 @@ use crate::{ base_types::ObjectID, committee::EpochId, error::IotaError, - governance::{StakedIota, StakedIotaTrait}, + governance::StakedIota, id::UID, object::{Data, Object}, }; diff --git a/crates/iota/src/genesis_inspector.rs b/crates/iota/src/genesis_inspector.rs index 50a9a7d123d..5944e61ff8b 100644 --- a/crates/iota/src/genesis_inspector.rs +++ b/crates/iota/src/genesis_inspector.rs @@ -10,7 +10,7 @@ use iota_types::{ base_types::ObjectID, coin::CoinMetadata, gas_coin::{GasCoin, IotaTreasuryCap, NANOS_PER_IOTA}, - governance::{StakedIota, StakedIotaTrait}, + governance::StakedIota, iota_system_state::IotaValidatorGenesis, move_package::MovePackage, object::{MoveObject, Owner}, From 0c46c603f8bc8bb224ff8f195cb5cb5a41649ac5 Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 18:15:59 +0200 Subject: [PATCH 30/62] Revert "refactor(iota-types/timelock): Wrap TimelockedStakedIotaV1 with enum TimelockedStakedIota" This reverts commit 14308e808b72b905529a8199b612a059431c62b8. --- crates/iota-genesis-builder/src/lib.rs | 2 +- .../iota-indexer/src/apis/governance_api.rs | 2 +- crates/iota-json-rpc/src/governance_api.rs | 2 +- .../src/timelock/timelocked_staked_iota.rs | 91 ++++--------------- 4 files changed, 22 insertions(+), 75 deletions(-) diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index a52a92f4b99..2b29256daa6 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -66,7 +66,7 @@ use iota_types::{ stardust::stardust_to_iota_address, timelock::{ stardust_upgrade_label::STARDUST_UPGRADE_LABEL_VALUE, - timelocked_staked_iota::{TimelockedStakedIota, TimelockedStakedIotaTrait}, + timelocked_staked_iota::TimelockedStakedIota, }, transaction::{ CallArg, CheckedInputObjects, Command, InputObjectKind, ObjectArg, ObjectReadResult, diff --git a/crates/iota-indexer/src/apis/governance_api.rs b/crates/iota-indexer/src/apis/governance_api.rs index 0a3448c0b22..c8a53e558a9 100644 --- a/crates/iota-indexer/src/apis/governance_api.rs +++ b/crates/iota-indexer/src/apis/governance_api.rs @@ -23,7 +23,7 @@ use iota_types::{ PoolTokenExchangeRate, PoolTokenExchangeRateTrait, iota_system_state_summary::IotaSystemStateSummary, }, - timelock::timelocked_staked_iota::{TimelockedStakedIota, TimelockedStakedIotaTrait}, + timelock::timelocked_staked_iota::TimelockedStakedIota, }; use jsonrpsee::{RpcModule, core::RpcResult}; diff --git a/crates/iota-json-rpc/src/governance_api.rs b/crates/iota-json-rpc/src/governance_api.rs index a59038ebe02..854a73b588f 100644 --- a/crates/iota-json-rpc/src/governance_api.rs +++ b/crates/iota-json-rpc/src/governance_api.rs @@ -29,7 +29,7 @@ use iota_types::{ get_validator_from_table, iota_system_state_summary::IotaSystemStateSummary, }, object::{Object, ObjectRead}, - timelock::timelocked_staked_iota::{TimelockedStakedIota, TimelockedStakedIotaTrait}, + timelock::timelocked_staked_iota::TimelockedStakedIota, }; use itertools::Itertools; use jsonrpsee::{RpcModule, core::RpcResult}; diff --git a/crates/iota-types/src/timelock/timelocked_staked_iota.rs b/crates/iota-types/src/timelock/timelocked_staked_iota.rs index 67bc345c1a6..d67e658b34e 100644 --- a/crates/iota-types/src/timelock/timelocked_staked_iota.rs +++ b/crates/iota-types/src/timelock/timelocked_staked_iota.rs @@ -1,7 +1,6 @@ // Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -use enum_dispatch::enum_dispatch; use move_core_types::{ident_str, identifier::IdentStr, language_storage::StructTag}; use serde::{Deserialize, Serialize}; @@ -18,37 +17,17 @@ use crate::{ pub const TIMELOCKED_STAKED_IOTA_MODULE_NAME: &IdentStr = ident_str!("timelocked_staking"); pub const TIMELOCKED_STAKED_IOTA_STRUCT_NAME: &IdentStr = ident_str!("TimelockedStakedIota"); -/// This is the standard API that all inner TimelockedStakedIota object type -/// should implement. -#[enum_dispatch] -pub trait TimelockedStakedIotaTrait { - /// Get the TimelockedStakedIota's `id`. - fn id(&self) -> ObjectID; - - /// Get the wrapped StakedIota's `pool_id`. - fn pool_id(&self) -> ObjectID; - - /// Get the wrapped StakedIota's `activation_epoch`. - fn activation_epoch(&self) -> EpochId; - - /// Get the wrapped StakedIota's `request_epoch`. - fn request_epoch(&self) -> EpochId; - - /// Get the wrapped StakedIota's `principal`. - fn principal(&self) -> u64; - - /// Get the TimelockedStakedIota's `expiration_timestamp_ms`. - fn expiration_timestamp_ms(&self) -> u64; - - /// Get the TimelockedStakedIota's `label`. - fn label(&self) -> &Option; -} - +/// Rust version of the Move +/// stardust::timelocked_staked_iota::TimelockedStakedIota type. #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -#[enum_dispatch(TimelockedStakedIotaTrait)] -pub enum TimelockedStakedIota { - V1(TimelockedStakedIotaV1), - // Add other versions here +pub struct TimelockedStakedIota { + id: UID, + /// A self-custodial object holding the staked IOTA tokens. + staked_iota: StakedIota, + /// This is the epoch time stamp of when the lock expires. + expiration_timestamp_ms: u64, + /// Timelock related label. + label: Option, } impl TimelockedStakedIota { @@ -69,77 +48,45 @@ impl TimelockedStakedIota { && s.name.as_ident_str() == TIMELOCKED_STAKED_IOTA_STRUCT_NAME && s.type_params.is_empty() } -} -impl TryFrom<&Object> for TimelockedStakedIota { - type Error = IotaError; - - fn try_from(object: &Object) -> Result { - // Try to convert to V1 - if let Ok(v1) = TimelockedStakedIotaV1::try_from(object) { - return Ok(TimelockedStakedIota::V1(v1)); - } - - // Add other versions here - - Err(IotaError::Type { - error: "Object is not a recognized TimelockedStakedIota version".to_string(), - }) - } -} - -/// Rust version of the Move -/// stardust::timelocked_staked_iota::TimelockedStakedIotaV1 type. -#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -pub struct TimelockedStakedIotaV1 { - id: UID, - /// A self-custodial object holding the staked IOTA tokens. - staked_iota: StakedIota, - /// This is the epoch time stamp of when the lock expires. - expiration_timestamp_ms: u64, - /// Timelock related label. - label: Option, -} - -impl TimelockedStakedIotaTrait for TimelockedStakedIotaV1 { /// Get the TimelockedStakedIota's `id`. - fn id(&self) -> ObjectID { + pub fn id(&self) -> ObjectID { self.id.id.bytes } /// Get the wrapped StakedIota's `pool_id`. - fn pool_id(&self) -> ObjectID { + pub fn pool_id(&self) -> ObjectID { self.staked_iota.pool_id() } /// Get the wrapped StakedIota's `activation_epoch`. - fn activation_epoch(&self) -> EpochId { + pub fn activation_epoch(&self) -> EpochId { self.staked_iota.activation_epoch() } /// Get the wrapped StakedIota's `request_epoch`. - fn request_epoch(&self) -> EpochId { + pub fn request_epoch(&self) -> EpochId { // TODO: this might change when we implement warm up period. self.staked_iota.activation_epoch().saturating_sub(1) } /// Get the wrapped StakedIota's `principal`. - fn principal(&self) -> u64 { + pub fn principal(&self) -> u64 { self.staked_iota.principal() } /// Get the TimelockedStakedIota's `expiration_timestamp_ms`. - fn expiration_timestamp_ms(&self) -> u64 { + pub fn expiration_timestamp_ms(&self) -> u64 { self.expiration_timestamp_ms } - /// Get the TimelockedStakedIota's `label`. - fn label(&self) -> &Option { + /// Get the TimelockedStakedIota's `label``. + pub fn label(&self) -> &Option { &self.label } } -impl TryFrom<&Object> for TimelockedStakedIotaV1 { +impl TryFrom<&Object> for TimelockedStakedIota { type Error = IotaError; fn try_from(object: &Object) -> Result { match &object.data { From accd6a3a33caa990635057c1a0359376a1142b52 Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 20:49:22 +0200 Subject: [PATCH 31/62] refactor(iota-framework): remove version from StakedIota and TimelockedStakedIota --- .../iota-system/sources/iota_system.move | 8 +- .../sources/iota_system_state_inner.move | 8 +- .../iota-system/sources/staking_pool.move | 64 +++++------ .../sources/timelocked_staking.move | 104 +++++++++--------- .../iota-system/sources/validator.move | 10 +- .../iota-system/sources/validator_set.move | 6 +- .../iota-system/tests/delegation_tests.move | 30 ++--- .../tests/governance_test_utils.move | 8 +- .../tests/timelocked_delegation_tests.move | 64 +++++------ .../tests/validator_set_tests.move | 4 +- .../iota-system/tests/validator_tests.move | 8 +- .../packages_compiled/iota-system | Bin 43081 -> 43067 bytes crates/iota-framework/published_api.txt | 4 +- 13 files changed, 159 insertions(+), 159 deletions(-) diff --git a/crates/iota-framework/packages/iota-system/sources/iota_system.move b/crates/iota-framework/packages/iota-system/sources/iota_system.move index 7aadc5ed292..38d7de673cd 100644 --- a/crates/iota-framework/packages/iota-system/sources/iota_system.move +++ b/crates/iota-framework/packages/iota-system/sources/iota_system.move @@ -43,7 +43,7 @@ module iota_system::iota_system { use iota::balance::Balance; use iota::coin::Coin; - use iota_system::staking_pool::StakedIotaV1; + use iota_system::staking_pool::StakedIota; use iota::iota::{IOTA, IotaTreasuryCap}; use iota::table::Table; use iota::timelock::SystemTimelockCap; @@ -242,7 +242,7 @@ module iota_system::iota_system { stake: Coin, validator_address: address, ctx: &mut TxContext, - ): StakedIotaV1 { + ): StakedIota { let self = load_system_state_mut(wrapper); self.request_add_stake(stake, validator_address, ctx) } @@ -263,7 +263,7 @@ module iota_system::iota_system { /// Withdraw stake from a validator's staking pool. public entry fun request_withdraw_stake( wrapper: &mut IotaSystemState, - staked_iota: StakedIotaV1, + staked_iota: StakedIota, ctx: &mut TxContext, ) { let withdrawn_stake = request_withdraw_stake_non_entry(wrapper, staked_iota, ctx); @@ -273,7 +273,7 @@ module iota_system::iota_system { /// Non-entry version of `request_withdraw_stake` that returns the withdrawn IOTA instead of transferring it to the sender. public fun request_withdraw_stake_non_entry( wrapper: &mut IotaSystemState, - staked_iota: StakedIotaV1, + staked_iota: StakedIota, ctx: &mut TxContext, ) : Balance { let self = load_system_state_mut(wrapper); diff --git a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move index ed99a079788..54d2253e7a6 100644 --- a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move +++ b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move @@ -5,7 +5,7 @@ module iota_system::iota_system_state_inner { use iota::balance::{Self, Balance}; use iota::coin::Coin; - use iota_system::staking_pool::StakedIotaV1; + use iota_system::staking_pool::StakedIota; use iota::iota::{IOTA, IotaTreasuryCap}; use iota_system::validator::{Self, ValidatorV1}; use iota_system::validator_set::{Self, ValidatorSetV1}; @@ -345,7 +345,7 @@ module iota_system::iota_system_state_inner { stake: Coin, validator_address: address, ctx: &mut TxContext, - ) : StakedIotaV1 { + ) : StakedIota { self.validators.request_add_stake( validator_address, stake.into_balance(), @@ -360,7 +360,7 @@ module iota_system::iota_system_state_inner { stake_amount: option::Option, validator_address: address, ctx: &mut TxContext, - ) : StakedIotaV1 { + ) : StakedIota { let balance = extract_coin_balance(stakes, stake_amount, ctx); self.validators.request_add_stake(validator_address, balance, ctx) } @@ -368,7 +368,7 @@ module iota_system::iota_system_state_inner { /// Withdraw some portion of a stake from a validator's staking pool. public(package) fun request_withdraw_stake( self: &mut IotaSystemStateV1, - staked_iota: StakedIotaV1, + staked_iota: StakedIota, ctx: &TxContext, ) : Balance { self.validators.request_withdraw_stake(staked_iota, ctx) diff --git a/crates/iota-framework/packages/iota-system/sources/staking_pool.move b/crates/iota-framework/packages/iota-system/sources/staking_pool.move index 0839b880619..5f26a9f289c 100644 --- a/crates/iota-framework/packages/iota-system/sources/staking_pool.move +++ b/crates/iota-framework/packages/iota-system/sources/staking_pool.move @@ -10,7 +10,7 @@ module iota_system::staking_pool { use iota::bag::Bag; use iota::bag; - /// StakedIotaV1 objects cannot be split to below this amount. + /// StakedIota objects cannot be split to below this amount. const MIN_STAKING_THRESHOLD: u64 = 1_000_000_000; // 1 IOTA const EInsufficientPoolTokenBalance: u64 = 0; @@ -43,7 +43,7 @@ module iota_system::staking_pool { /// `Some()` if in-active, and it was de-activated at epoch ``. deactivation_epoch: Option, /// The total number of IOTA tokens in this pool, including the IOTA in the rewards_pool, as well as in all the principal - /// in the `StakedIotaV1` object, updated at epoch boundaries. + /// in the `StakedIota` object, updated at epoch boundaries. iota_balance: u64, /// The epoch stake rewards will be added here at the end of each epoch. rewards_pool: Balance, @@ -71,7 +71,7 @@ module iota_system::staking_pool { } /// A self-custodial object holding the staked IOTA tokens. - public struct StakedIotaV1 has key, store { + public struct StakedIota has key, store { id: UID, /// ID of the staking pool we are staking with. pool_id: ID, @@ -109,11 +109,11 @@ module iota_system::staking_pool { stake: Balance, stake_activation_epoch: u64, ctx: &mut TxContext - ) : StakedIotaV1 { + ) : StakedIota { let iota_amount = stake.value(); assert!(!is_inactive(pool), EDelegationToInactivePool); assert!(iota_amount > 0, EDelegationOfZeroIota); - let staked_iota = StakedIotaV1 { + let staked_iota = StakedIota { id: object::new(ctx), pool_id: object::id(pool), stake_activation_epoch, @@ -128,7 +128,7 @@ module iota_system::staking_pool { /// A proportional amount of pool token withdraw is recorded and processed at epoch change time. public(package) fun request_withdraw_stake( pool: &mut StakingPoolV1, - staked_iota: StakedIotaV1, + staked_iota: StakedIota, ctx: &TxContext ) : Balance { // stake is inactive @@ -159,12 +159,12 @@ module iota_system::staking_pool { principal_withdraw } - /// Withdraw the principal IOTA stored in the StakedIotaV1 object, and calculate the corresponding amount of pool + /// Withdraw the principal IOTA stored in the StakedIota object, and calculate the corresponding amount of pool /// tokens using exchange rate at staking epoch. /// Returns values are amount of pool tokens withdrawn and withdrawn principal portion of IOTA. public(package) fun withdraw_from_principal( pool: &StakingPoolV1, - staked_iota: StakedIotaV1, + staked_iota: StakedIota, ) : (u64, Balance) { // Check that the stake information matches the pool. @@ -183,8 +183,8 @@ module iota_system::staking_pool { ) } - fun unwrap_staked_iota(staked_iota: StakedIotaV1): Balance { - let StakedIotaV1 { + fun unwrap_staked_iota(staked_iota: StakedIota): Balance { + let StakedIota { id, pool_id: _, stake_activation_epoch: _, @@ -194,8 +194,8 @@ module iota_system::staking_pool { principal } - /// Allows calling `.into_balance()` on `StakedIotaV1` to invoke `unwrap_staked_iota` - public use fun unwrap_staked_iota as StakedIotaV1.into_balance; + /// Allows calling `.into_balance()` on `StakedIota` to invoke `unwrap_staked_iota` + public use fun unwrap_staked_iota as StakedIota.into_balance; // ==== functions called at epoch boundaries === @@ -241,7 +241,7 @@ module iota_system::staking_pool { /// 2. Using the above number and the given `principal_withdraw_amount`, calculates the rewards portion of the /// stake we should withdraw. /// 3. Withdraws the rewards portion from the rewards pool at the current exchange rate. We only withdraw the rewards - /// portion because the principal portion was already taken out of the staker's self custodied StakedIotaV1. + /// portion because the principal portion was already taken out of the staker's self custodied StakedIota. fun withdraw_rewards( pool: &mut StakingPoolV1, principal_withdraw_amount: u64, @@ -292,14 +292,14 @@ module iota_system::staking_pool { public fun iota_balance(pool: &StakingPoolV1): u64 { pool.iota_balance } - public fun pool_id(staked_iota: &StakedIotaV1): ID { staked_iota.pool_id } + public fun pool_id(staked_iota: &StakedIota): ID { staked_iota.pool_id } - public fun staked_iota_amount(staked_iota: &StakedIotaV1): u64 { staked_iota.principal.value() } + public fun staked_iota_amount(staked_iota: &StakedIota): u64 { staked_iota.principal.value() } - /// Allows calling `.amount()` on `StakedIotaV1` to invoke `staked_iota_amount` - public use fun staked_iota_amount as StakedIotaV1.amount; + /// Allows calling `.amount()` on `StakedIota` to invoke `staked_iota_amount` + public use fun staked_iota_amount as StakedIota.amount; - public fun stake_activation_epoch(staked_iota: &StakedIotaV1): u64 { + public fun stake_activation_epoch(staked_iota: &StakedIota): u64 { staked_iota.stake_activation_epoch } @@ -313,17 +313,17 @@ module iota_system::staking_pool { pool.deactivation_epoch.is_some() } - /// Split StakedIotaV1 `self` to two parts, one with principal `split_amount`, + /// Split StakedIota `self` to two parts, one with principal `split_amount`, /// and the remaining principal is left in `self`. - /// All the other parameters of the StakedIotaV1 like `stake_activation_epoch` or `pool_id` remain the same. - public fun split(self: &mut StakedIotaV1, split_amount: u64, ctx: &mut TxContext): StakedIotaV1 { + /// All the other parameters of the StakedIota like `stake_activation_epoch` or `pool_id` remain the same. + public fun split(self: &mut StakedIota, split_amount: u64, ctx: &mut TxContext): StakedIota { let original_amount = self.principal.value(); assert!(split_amount <= original_amount, EInsufficientIotaTokenBalance); let remaining_amount = original_amount - split_amount; // Both resulting parts should have at least MIN_STAKING_THRESHOLD. assert!(remaining_amount >= MIN_STAKING_THRESHOLD, EStakedIotaBelowThreshold); assert!(split_amount >= MIN_STAKING_THRESHOLD, EStakedIotaBelowThreshold); - StakedIotaV1 { + StakedIota { id: object::new(ctx), pool_id: self.pool_id, stake_activation_epoch: self.stake_activation_epoch, @@ -331,20 +331,20 @@ module iota_system::staking_pool { } } - /// Split the given StakedIotaV1 to the two parts, one with principal `split_amount`, + /// Split the given StakedIota to the two parts, one with principal `split_amount`, /// transfer the newly split part to the sender address. - public entry fun split_staked_iota(stake: &mut StakedIotaV1, split_amount: u64, ctx: &mut TxContext) { + public entry fun split_staked_iota(stake: &mut StakedIota, split_amount: u64, ctx: &mut TxContext) { transfer::transfer(split(stake, split_amount, ctx), ctx.sender()); } - /// Allows calling `.split_to_sender()` on `StakedIotaV1` to invoke `split_staked_iota` - public use fun split_staked_iota as StakedIotaV1.split_to_sender; + /// Allows calling `.split_to_sender()` on `StakedIota` to invoke `split_staked_iota` + public use fun split_staked_iota as StakedIota.split_to_sender; /// Consume the staked iota `other` and add its value to `self`. /// Aborts if some of the staking parameters are incompatible (pool id, stake activation epoch, etc.) - public entry fun join_staked_iota(self: &mut StakedIotaV1, other: StakedIotaV1) { + public entry fun join_staked_iota(self: &mut StakedIota, other: StakedIota) { assert!(is_equal_staking_metadata(self, &other), EIncompatibleStakedIota); - let StakedIotaV1 { + let StakedIota { id, pool_id: _, stake_activation_epoch: _, @@ -355,11 +355,11 @@ module iota_system::staking_pool { self.principal.join(principal); } - /// Allows calling `.join()` on `StakedIotaV1` to invoke `join_staked_iota` - public use fun join_staked_iota as StakedIotaV1.join; + /// Allows calling `.join()` on `StakedIota` to invoke `join_staked_iota` + public use fun join_staked_iota as StakedIota.join; /// Returns true if all the staking parameters of the staked iota except the principal are identical - public fun is_equal_staking_metadata(self: &StakedIotaV1, other: &StakedIotaV1): bool { + public fun is_equal_staking_metadata(self: &StakedIota, other: &StakedIota): bool { (self.pool_id == other.pool_id) && (self.stake_activation_epoch == other.stake_activation_epoch) } @@ -454,7 +454,7 @@ module iota_system::staking_pool { #[test_only] public fun calculate_rewards( pool: &StakingPoolV1, - staked_iota: &StakedIotaV1, + staked_iota: &StakedIota, current_epoch: u64, ): u64 { let staked_amount = staked_iota_amount(staked_iota); diff --git a/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move b/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move index 4a6e06f0d16..c5cd343cb39 100644 --- a/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move +++ b/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move @@ -10,19 +10,19 @@ module iota_system::timelocked_staking { use iota::timelock::{Self, TimeLock}; use iota_system::iota_system::{IotaSystemState}; - use iota_system::staking_pool::StakedIotaV1; + use iota_system::staking_pool::StakedIota; use iota_system::validator::{ValidatorV1}; /// For when trying to stake an expired time-locked balance. const ETimeLockShouldNotBeExpired: u64 = 0; - /// Incompatible objects when joining TimelockedStakedIotaV1 + /// Incompatible objects when joining TimelockedStakedIota const EIncompatibleTimelockedStakedIota: u64 = 1; /// A self-custodial object holding the timelocked staked IOTA tokens. - public struct TimelockedStakedIotaV1 has key { + public struct TimelockedStakedIota has key { id: UID, /// A self-custodial object holding the staked IOTA tokens. - staked_iota: StakedIotaV1, + staked_iota: StakedIota, /// This is the epoch time stamp of when the lock expires. expiration_timestamp_ms: u64, /// Timelock related label. @@ -76,7 +76,7 @@ module iota_system::timelocked_staking { /// Withdraw a time-locked stake from a validator's staking pool. public entry fun request_withdraw_stake( iota_system: &mut IotaSystemState, - timelocked_staked_iota: TimelockedStakedIotaV1, + timelocked_staked_iota: TimelockedStakedIota, ctx: &mut TxContext, ) { // Withdraw the time-locked balance. @@ -102,7 +102,7 @@ module iota_system::timelocked_staking { timelocked_balance: TimeLock>, validator_address: address, ctx: &mut TxContext, - ) : TimelockedStakedIotaV1 { + ) : TimelockedStakedIota { // Check the preconditions. assert!(timelocked_balance.is_locked(ctx), ETimeLockShouldNotBeExpired); @@ -118,7 +118,7 @@ module iota_system::timelocked_staking { ); // Create and return a receipt. - TimelockedStakedIotaV1 { + TimelockedStakedIota { id: object::new(ctx), staked_iota, expiration_timestamp_ms, @@ -133,7 +133,7 @@ module iota_system::timelocked_staking { mut timelocked_balances: vector>>, validator_address: address, ctx: &mut TxContext, - ) : vector { + ) : vector { // Create a vector to store the results. let mut result = vector[]; @@ -164,10 +164,10 @@ module iota_system::timelocked_staking { /// instead of transferring it to the sender. public fun request_withdraw_stake_non_entry( iota_system: &mut IotaSystemState, - timelocked_staked_iota: TimelockedStakedIotaV1, + timelocked_staked_iota: TimelockedStakedIota, ctx: &mut TxContext, ) : (TimeLock>, Balance) { - // Unpack the `TimelockedStakedIotaV1` instance. + // Unpack the `TimelockedStakedIota` instance. let (staked_iota, expiration_timestamp_ms, label) = timelocked_staked_iota.unpack(); // Store the original stake amount. @@ -185,15 +185,15 @@ module iota_system::timelocked_staking { (timelock::system_pack(sys_timelock_cap, principal, expiration_timestamp_ms, label, ctx), withdraw_stake) } - // === TimelockedStakedIotaV1 balance functions === + // === TimelockedStakedIota balance functions === - /// Split `TimelockedStakedIotaV1` into two parts, one with principal `split_amount`, + /// Split `TimelockedStakedIota` into two parts, one with principal `split_amount`, /// and the remaining principal is left in `self`. - /// All the other parameters of the `TimelockedStakedIotaV1` like `stake_activation_epoch` or `pool_id` remain the same. - public fun split(self: &mut TimelockedStakedIotaV1, split_amount: u64, ctx: &mut TxContext): TimelockedStakedIotaV1 { + /// All the other parameters of the `TimelockedStakedIota` like `stake_activation_epoch` or `pool_id` remain the same. + public fun split(self: &mut TimelockedStakedIota, split_amount: u64, ctx: &mut TxContext): TimelockedStakedIota { let split_stake = self.staked_iota.split(split_amount, ctx); - TimelockedStakedIotaV1 { + TimelockedStakedIota { id: object::new(ctx), staked_iota: split_stake, expiration_timestamp_ms: self.expiration_timestamp_ms, @@ -201,21 +201,21 @@ module iota_system::timelocked_staking { } } - /// Split the given `TimelockedStakedIotaV1` to the two parts, one with principal `split_amount`, + /// Split the given `TimelockedStakedIota` to the two parts, one with principal `split_amount`, /// transfer the newly split part to the sender address. - public entry fun split_staked_iota(stake: &mut TimelockedStakedIotaV1, split_amount: u64, ctx: &mut TxContext) { + public entry fun split_staked_iota(stake: &mut TimelockedStakedIota, split_amount: u64, ctx: &mut TxContext) { split(stake, split_amount, ctx).transfer_to_sender(ctx); } - /// Allows calling `.split_to_sender()` on `TimelockedStakedIotaV1` to invoke `split_staked_iota` - public use fun split_staked_iota as TimelockedStakedIotaV1.split_to_sender; + /// Allows calling `.split_to_sender()` on `TimelockedStakedIota` to invoke `split_staked_iota` + public use fun split_staked_iota as TimelockedStakedIota.split_to_sender; /// Consume the staked iota `other` and add its value to `self`. /// Aborts if some of the staking parameters are incompatible (pool id, stake activation epoch, etc.) - public entry fun join_staked_iota(self: &mut TimelockedStakedIotaV1, other: TimelockedStakedIotaV1) { + public entry fun join_staked_iota(self: &mut TimelockedStakedIota, other: TimelockedStakedIota) { assert!(self.is_equal_staking_metadata(&other), EIncompatibleTimelockedStakedIota); - let TimelockedStakedIotaV1 { + let TimelockedStakedIota { id, staked_iota, expiration_timestamp_ms: _, @@ -227,57 +227,57 @@ module iota_system::timelocked_staking { self.staked_iota.join(staked_iota); } - /// Allows calling `.join()` on `TimelockedStakedIotaV1` to invoke `join_staked_iota` - public use fun join_staked_iota as TimelockedStakedIotaV1.join; + /// Allows calling `.join()` on `TimelockedStakedIota` to invoke `join_staked_iota` + public use fun join_staked_iota as TimelockedStakedIota.join; - // === TimelockedStakedIotaV1 public utilities === + // === TimelockedStakedIota public utilities === - /// A utility function to transfer a `TimelockedStakedIotaV1`. - public fun transfer_to_sender(stake: TimelockedStakedIotaV1, ctx: &TxContext) { + /// A utility function to transfer a `TimelockedStakedIota`. + public fun transfer_to_sender(stake: TimelockedStakedIota, ctx: &TxContext) { transfer(stake, ctx.sender()) } - /// A utility function to transfer multiple `TimelockedStakedIotaV1`. - public fun transfer_to_sender_multiple(stakes: vector, ctx: &TxContext) { + /// A utility function to transfer multiple `TimelockedStakedIota`. + public fun transfer_to_sender_multiple(stakes: vector, ctx: &TxContext) { transfer_multiple(stakes, ctx.sender()) } /// A utility function that returns true if all the staking parameters /// of the staked iota except the principal are identical - public fun is_equal_staking_metadata(self: &TimelockedStakedIotaV1, other: &TimelockedStakedIotaV1): bool { + public fun is_equal_staking_metadata(self: &TimelockedStakedIota, other: &TimelockedStakedIota): bool { self.staked_iota.is_equal_staking_metadata(&other.staked_iota) && (self.expiration_timestamp_ms == other.expiration_timestamp_ms) && (self.label() == other.label()) } - // === TimelockedStakedIotaV1 getters === + // === TimelockedStakedIota getters === - /// Function to get the pool id of a `TimelockedStakedIotaV1`. - public fun pool_id(self: &TimelockedStakedIotaV1): ID { self.staked_iota.pool_id() } + /// Function to get the pool id of a `TimelockedStakedIota`. + public fun pool_id(self: &TimelockedStakedIota): ID { self.staked_iota.pool_id() } - /// Function to get the staked iota amount of a `TimelockedStakedIotaV1`. - public fun staked_iota_amount(self: &TimelockedStakedIotaV1): u64 { self.staked_iota.staked_iota_amount() } + /// Function to get the staked iota amount of a `TimelockedStakedIota`. + public fun staked_iota_amount(self: &TimelockedStakedIota): u64 { self.staked_iota.staked_iota_amount() } - /// Allows calling `.amount()` on `TimelockedStakedIotaV1` to invoke `staked_iota_amount` - public use fun staked_iota_amount as TimelockedStakedIotaV1.amount; + /// Allows calling `.amount()` on `TimelockedStakedIota` to invoke `staked_iota_amount` + public use fun staked_iota_amount as TimelockedStakedIota.amount; - /// Function to get the stake activation epoch of a `TimelockedStakedIotaV1`. - public fun stake_activation_epoch(self: &TimelockedStakedIotaV1): u64 { + /// Function to get the stake activation epoch of a `TimelockedStakedIota`. + public fun stake_activation_epoch(self: &TimelockedStakedIota): u64 { self.staked_iota.stake_activation_epoch() } - /// Function to get the expiration timestamp of a `TimelockedStakedIotaV1`. - public fun expiration_timestamp_ms(self: &TimelockedStakedIotaV1): u64 { + /// Function to get the expiration timestamp of a `TimelockedStakedIota`. + public fun expiration_timestamp_ms(self: &TimelockedStakedIota): u64 { self.expiration_timestamp_ms } - /// Function to get the label of a `TimelockedStakedIotaV1`. - public fun label(self: &TimelockedStakedIotaV1): Option { + /// Function to get the label of a `TimelockedStakedIota`. + public fun label(self: &TimelockedStakedIota): Option { self.label } - /// Check if a `TimelockedStakedIotaV1` is labeled with the type `L`. - public fun is_labeled_with(self: &TimelockedStakedIotaV1): bool { + /// Check if a `TimelockedStakedIota` is labeled with the type `L`. + public fun is_labeled_with(self: &TimelockedStakedIota): bool { if (self.label.is_some()) { self.label.borrow() == timelock::type_name() } @@ -288,9 +288,9 @@ module iota_system::timelocked_staking { // === Internal === - /// A utility function to destroy a `TimelockedStakedIotaV1`. - fun unpack(self: TimelockedStakedIotaV1): (StakedIotaV1, u64, Option) { - let TimelockedStakedIotaV1 { + /// A utility function to destroy a `TimelockedStakedIota`. + fun unpack(self: TimelockedStakedIota): (StakedIota, u64, Option) { + let TimelockedStakedIota { id, staked_iota, expiration_timestamp_ms, @@ -303,13 +303,13 @@ module iota_system::timelocked_staking { } - /// A utility function to transfer a `TimelockedStakedIotaV1` to a receiver. - fun transfer(stake: TimelockedStakedIotaV1, receiver: address) { + /// A utility function to transfer a `TimelockedStakedIota` to a receiver. + fun transfer(stake: TimelockedStakedIota, receiver: address) { transfer::transfer(stake, receiver); } - /// A utility function to transfer a vector of `TimelockedStakedIotaV1` to a receiver. - fun transfer_multiple(mut stakes: vector, receiver: address) { + /// A utility function to transfer a vector of `TimelockedStakedIota` to a receiver. + fun transfer_multiple(mut stakes: vector, receiver: address) { // Transfer all the time-locked stakes to the recipient. while (!stakes.is_empty()) { let stake = stakes.pop_back(); @@ -332,7 +332,7 @@ module iota_system::timelocked_staking { ctx: &mut TxContext, ) { let staked_iota = validator.request_add_stake_at_genesis_with_receipt(stake, ctx); - let timelocked_staked_iota = TimelockedStakedIotaV1 { + let timelocked_staked_iota = TimelockedStakedIota { id: object::new(ctx), staked_iota, expiration_timestamp_ms, diff --git a/crates/iota-framework/packages/iota-system/sources/validator.move b/crates/iota-framework/packages/iota-system/sources/validator.move index a1f2b170ab6..028dd0a6a5a 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator.move +++ b/crates/iota-framework/packages/iota-system/sources/validator.move @@ -9,7 +9,7 @@ module iota_system::validator { use iota::balance::Balance; use iota::iota::IOTA; use iota_system::validator_cap::{Self, ValidatorOperationCap}; - use iota_system::staking_pool::{Self, PoolTokenExchangeRateV1, StakedIotaV1, StakingPoolV1}; + use iota_system::staking_pool::{Self, PoolTokenExchangeRateV1, StakedIota, StakingPoolV1}; use std::string::String; use iota::url::Url; use iota::url; @@ -285,7 +285,7 @@ module iota_system::validator { stake: Balance, staker_address: address, ctx: &mut TxContext, - ) : StakedIotaV1 { + ) : StakedIota { let stake_amount = stake.value(); assert!(stake_amount > 0, EInvalidStakeAmount); let stake_epoch = ctx.epoch() + 1; @@ -323,12 +323,12 @@ module iota_system::validator { } /// Internal request to add stake to the validator's staking pool at genesis. - /// Returns a StakedIotaV1 + /// Returns a StakedIota public(package) fun request_add_stake_at_genesis_with_receipt( self: &mut ValidatorV1, stake: Balance, ctx: &mut TxContext, - ) : StakedIotaV1 { + ) : StakedIota { assert!(ctx.epoch() == 0, ECalledDuringNonGenesis); let stake_amount = stake.value(); assert!(stake_amount > 0, EInvalidStakeAmount); @@ -349,7 +349,7 @@ module iota_system::validator { /// Request to withdraw stake from the validator's staking pool, processed at the end of the epoch. public(package) fun request_withdraw_stake( self: &mut ValidatorV1, - staked_iota: StakedIotaV1, + staked_iota: StakedIota, ctx: &TxContext, ) : Balance { let principal_amount = staked_iota.staked_iota_amount(); diff --git a/crates/iota-framework/packages/iota-system/sources/validator_set.move b/crates/iota-framework/packages/iota-system/sources/validator_set.move index 8c1c0db5326..1f59425605c 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator_set.move +++ b/crates/iota-framework/packages/iota-system/sources/validator_set.move @@ -8,7 +8,7 @@ module iota_system::validator_set { use iota::iota::IOTA; use iota_system::validator::{ValidatorV1, staking_pool_id, iota_address}; use iota_system::validator_cap::{Self, UnverifiedValidatorOperationCap, ValidatorOperationCap}; - use iota_system::staking_pool::{PoolTokenExchangeRateV1, StakedIotaV1, pool_id}; + use iota_system::staking_pool::{PoolTokenExchangeRateV1, StakedIota, pool_id}; use iota::priority_queue as pq; use iota::vec_map::{Self, VecMap}; use iota::vec_set::VecSet; @@ -264,7 +264,7 @@ module iota_system::validator_set { validator_address: address, stake: Balance, ctx: &mut TxContext, - ) : StakedIotaV1 { + ) : StakedIota { let iota_amount = stake.value(); assert!(iota_amount >= MIN_STAKING_THRESHOLD, EStakingBelowThreshold); let validator = get_candidate_or_active_validator_mut(self, validator_address); @@ -279,7 +279,7 @@ module iota_system::validator_set { /// the stake and any rewards corresponding to it will be immediately processed. public(package) fun request_withdraw_stake( self: &mut ValidatorSetV1, - staked_iota: StakedIotaV1, + staked_iota: StakedIota, ctx: &TxContext, ) : Balance { let staking_pool_id = pool_id(&staked_iota); diff --git a/crates/iota-framework/packages/iota-system/tests/delegation_tests.move b/crates/iota-framework/packages/iota-system/tests/delegation_tests.move index 0b1bbecce25..0a8ff9e2811 100644 --- a/crates/iota-framework/packages/iota-system/tests/delegation_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/delegation_tests.move @@ -7,7 +7,7 @@ module iota_system::stake_tests { use iota::coin; use iota::test_scenario; use iota_system::iota_system::IotaSystemState; - use iota_system::staking_pool::{Self, StakedIotaV1, PoolTokenExchangeRateV1}; + use iota_system::staking_pool::{Self, StakedIota, PoolTokenExchangeRateV1}; use iota::test_utils::assert_eq; use iota_system::validator_set; use iota::test_utils; @@ -45,7 +45,7 @@ module iota_system::stake_tests { #[test] fun test_split_join_staked_iota() { - // All this is just to generate a dummy StakedIotaV1 object to split and join later + // All this is just to generate a dummy StakedIota object to split and join later set_up_iota_system_state(); let mut scenario_val = test_scenario::begin(STAKER_ADDR_1); let scenario = &mut scenario_val; @@ -53,7 +53,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); staked_iota.split_to_sender(20 * NANOS_PER_IOTA, ctx); scenario.return_to_sender(staked_iota); @@ -62,12 +62,12 @@ module iota_system::stake_tests { // Verify the correctness of the split and send the join txn scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); + let staked_iota_ids = scenario.ids_for_sender(); assert!(staked_iota_ids.length() == 2); // staked iota split to 2 coins - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); let amount1 = part1.amount(); let amount2 = part2.amount(); @@ -98,9 +98,9 @@ module iota_system::stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -120,7 +120,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. staked_iota.split_to_sender(1 * NANOS_PER_IOTA + 1, ctx); @@ -140,7 +140,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. let stake = staked_iota.split(1 * NANOS_PER_IOTA + 1, ctx); @@ -179,7 +179,7 @@ module iota_system::stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert!(staked_iota.amount() == 60 * NANOS_PER_IOTA); @@ -255,7 +255,7 @@ module iota_system::stake_tests { assert!(!system_state_mut_ref.validators().is_active_validator_by_iota_address(VALIDATOR_ADDR_1)); - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -304,7 +304,7 @@ module iota_system::stake_tests { let mut system_state = scenario.take_shared(); let system_state_mut_ref = &mut system_state; - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -517,7 +517,7 @@ module iota_system::stake_tests { let scenario = &mut scenario_val; stake_with(@0x42, @0x2, 100, scenario); // stakes 100 IOTA with 0x2 scenario.next_tx(@0x42); - let staked_iota = scenario.take_from_address(@0x42); + let staked_iota = scenario.take_from_address(@0x42); let pool_id = staked_iota.pool_id(); test_scenario::return_to_address(@0x42, staked_iota); advance_epoch(scenario); // advances epoch to effectuate the stake diff --git a/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move b/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move index 86fc56f561a..9e03461d638 100644 --- a/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move +++ b/crates/iota-framework/packages/iota-system/tests/governance_test_utils.move @@ -8,7 +8,7 @@ module iota_system::governance_test_utils { use iota::balance; use iota::iota::{Self, IOTA}; use iota::coin::{Self, Coin}; - use iota_system::staking_pool::{StakedIotaV1, StakingPoolV1}; + use iota_system::staking_pool::{StakedIota, StakingPoolV1}; use iota::test_utils::assert_eq; use iota_system::validator::{Self, ValidatorV1}; use iota_system::iota_system::{Self, IotaSystemState}; @@ -188,7 +188,7 @@ module iota_system::governance_test_utils { staker: address, staked_iota_idx: u64, scenario: &mut Scenario ) { scenario.next_tx(staker); - let stake_iota_ids = scenario.ids_for_sender(); + let stake_iota_ids = scenario.ids_for_sender(); let staked_iota = scenario.take_from_sender_by_id(stake_iota_ids[staked_iota_idx]); let mut system_state = scenario.take_shared(); @@ -331,12 +331,12 @@ module iota_system::governance_test_utils { public fun stake_plus_current_rewards(addr: address, staking_pool: &StakingPoolV1, scenario: &mut Scenario): u64 { let mut sum = 0; scenario.next_tx(addr); - let mut stake_ids = scenario.ids_for_sender(); + let mut stake_ids = scenario.ids_for_sender(); let current_epoch = scenario.ctx().epoch(); while (!stake_ids.is_empty()) { let staked_iota_id = stake_ids.pop_back(); - let staked_iota = scenario.take_from_sender_by_id(staked_iota_id); + let staked_iota = scenario.take_from_sender_by_id(staked_iota_id); sum = sum + staking_pool.calculate_rewards(&staked_iota, current_epoch); scenario.return_to_sender(staked_iota); }; diff --git a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move index de7a4395232..de1802ca944 100644 --- a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move @@ -30,7 +30,7 @@ module iota_system::timelocked_stake_tests { total_iota_balance, unstake, }; - use iota_system::timelocked_staking::{Self, TimelockedStakedIotaV1}; + use iota_system::timelocked_staking::{Self, TimelockedStakedIota}; use iota::labeler::LabelerCap; use iota::timelock::{Self, TimeLock}; @@ -63,7 +63,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); staked_iota.split_to_sender(20 * NANOS_PER_IOTA, ctx); scenario.return_to_sender(staked_iota); @@ -72,11 +72,11 @@ module iota_system::timelocked_stake_tests { // Verify the correctness of the split and send the join txn scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); + let staked_iota_ids = scenario.ids_for_sender(); assert!(staked_iota_ids.length() == 2, 101); // staked iota split to 2 coins - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); let amount1 = part1.amount(); let amount2 = part2.amount(); @@ -105,9 +105,9 @@ module iota_system::timelocked_stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -129,9 +129,9 @@ module iota_system::timelocked_stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -163,9 +163,9 @@ module iota_system::timelocked_stake_tests { // Verify that these can be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -204,9 +204,9 @@ module iota_system::timelocked_stake_tests { // Verify that these cannot be merged scenario.next_tx(STAKER_ADDR_1); { - let staked_iota_ids = scenario.ids_for_sender(); - let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); - let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); + let staked_iota_ids = scenario.ids_for_sender(); + let mut part1 = scenario.take_from_sender_by_id(staked_iota_ids[0]); + let part2 = scenario.take_from_sender_by_id(staked_iota_ids[1]); part1.join(part2); @@ -239,7 +239,7 @@ module iota_system::timelocked_stake_tests { // Verify that it can be split scenario.next_tx(STAKER_ADDR_1); { - let mut original = scenario.take_from_sender(); + let mut original = scenario.take_from_sender(); let split = original.split(20 * NANOS_PER_IOTA, scenario.ctx()); assert_eq(original.staked_iota_amount(), 40 * NANOS_PER_IOTA); @@ -267,7 +267,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. staked_iota.split_to_sender(1 * NANOS_PER_IOTA + 1, ctx); @@ -287,7 +287,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let mut staked_iota = scenario.take_from_sender(); + let mut staked_iota = scenario.take_from_sender(); let ctx = scenario.ctx(); // The remaining amount after splitting is below the threshold so this should fail. let stake = staked_iota.split(1 * NANOS_PER_IOTA + 1, ctx); @@ -328,7 +328,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -394,7 +394,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -468,11 +468,11 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let stake_iota_ids = scenario.ids_for_sender(); + let stake_iota_ids = scenario.ids_for_sender(); - let staked_iota1 = scenario.take_from_sender_by_id(stake_iota_ids[0]); + let staked_iota1 = scenario.take_from_sender_by_id(stake_iota_ids[0]); assert_eq(staked_iota1.amount(), 30 * NANOS_PER_IOTA); - let staked_iota2 = scenario.take_from_sender_by_id(stake_iota_ids[1]); + let staked_iota2 = scenario.take_from_sender_by_id(stake_iota_ids[1]); assert_eq(staked_iota2.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -496,7 +496,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 60 * NANOS_PER_IOTA); let mut system_state = scenario.take_shared(); @@ -518,7 +518,7 @@ module iota_system::timelocked_stake_tests { scenario.next_tx(STAKER_ADDR_1); { - assert_eq(scenario.has_most_recent_for_sender(), false); + assert_eq(scenario.has_most_recent_for_sender(), false); let mut system_state = scenario.take_shared(); let system_state_mut_ref = &mut system_state; @@ -562,7 +562,7 @@ module iota_system::timelocked_stake_tests { assert!(!is_active_validator_by_iota_address(system_state_mut_ref.validators(), VALIDATOR_ADDR_1), 0); - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -620,7 +620,7 @@ module iota_system::timelocked_stake_tests { assert!(!is_active_validator_by_iota_address(system_state_mut_ref.validators(), VALIDATOR_ADDR_1), 0); - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -670,7 +670,7 @@ module iota_system::timelocked_stake_tests { let mut system_state = scenario.take_shared(); let system_state_mut_ref = &mut system_state; - let staked_iota = scenario.take_from_sender(); + let staked_iota = scenario.take_from_sender(); assert_eq(staked_iota.amount(), 100 * NANOS_PER_IOTA); // Unstake from VALIDATOR_ADDR_1 @@ -893,7 +893,7 @@ module iota_system::timelocked_stake_tests { let scenario = &mut scenario_val; stake_timelocked_with(@0x42, @0x2, 100, 10, scenario); // stakes 100 IOTA with 0x2 scenario.next_tx(@0x42); - let staked_iota = scenario.take_from_address(@0x42); + let staked_iota = scenario.take_from_address(@0x42); let pool_id = staked_iota.pool_id(); test_scenario::return_to_address(@0x42, staked_iota); advance_epoch(scenario); // advances epoch to effectuate the stake @@ -1081,7 +1081,7 @@ module iota_system::timelocked_stake_tests { staker: address, staked_iota_idx: u64, scenario: &mut Scenario ) { scenario.next_tx(staker); - let stake_iota_ids = scenario.ids_for_sender(); + let stake_iota_ids = scenario.ids_for_sender(); let staked_iota = scenario.take_from_sender_by_id(stake_iota_ids[staked_iota_idx]); let mut system_state = scenario.take_shared(); diff --git a/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move b/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move index 70589d844f1..bbb4ef06c61 100644 --- a/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/validator_set_tests.move @@ -6,7 +6,7 @@ module iota_system::validator_set_tests { use iota::balance; use iota::coin; - use iota_system::staking_pool::StakedIotaV1; + use iota_system::staking_pool::StakedIota; use iota_system::validator::{Self, ValidatorV1, staking_pool_id}; use iota_system::validator_set::{Self, ValidatorSetV1, active_validator_addresses}; use iota::test_scenario::{Self, Scenario}; @@ -368,7 +368,7 @@ module iota_system::validator_set_tests { // Withdraw the stake from @0x4. scenario.next_tx(@0x42); { - let stake = scenario.take_from_sender(); + let stake = scenario.take_from_sender(); let ctx = scenario.ctx(); let withdrawn_balance = validator_set.request_withdraw_stake( stake, diff --git a/crates/iota-framework/packages/iota-system/tests/validator_tests.move b/crates/iota-framework/packages/iota-system/tests/validator_tests.move index 6a6c361c3fc..f30c962ba85 100644 --- a/crates/iota-framework/packages/iota-system/tests/validator_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/validator_tests.move @@ -11,7 +11,7 @@ module iota_system::validator_tests { use iota::test_scenario; use iota::test_utils; use iota::url; - use iota_system::staking_pool::StakedIotaV1; + use iota_system::staking_pool::StakedIota; use iota_system::validator::{Self, ValidatorV1}; const VALID_NET_PUBKEY: vector = vector[171, 2, 39, 3, 139, 105, 166, 171, 153, 151, 102, 197, 151, 186, 140, 116, 114, 90, 213, 225, 20, 167, 60, 69, 203, 12, 180, 198, 9, 217, 117, 38]; @@ -82,7 +82,7 @@ module iota_system::validator_tests { // Check that after destroy, the original stake still exists. scenario.next_tx(sender); { - let stake = scenario.take_from_sender(); + let stake = scenario.take_from_sender(); assert!(stake.amount() == 10_000_000_000); scenario.return_to_sender(stake); }; @@ -110,8 +110,8 @@ module iota_system::validator_tests { scenario.next_tx(sender); { - let coin_ids = scenario.ids_for_sender(); - let stake = scenario.take_from_sender_by_id(coin_ids[0]); + let coin_ids = scenario.ids_for_sender(); + let stake = scenario.take_from_sender_by_id(coin_ids[0]); let ctx = scenario.ctx(); let withdrawn_balance = validator.request_withdraw_stake(stake, ctx); transfer::public_transfer(withdrawn_balance.into_coin(ctx), sender); diff --git a/crates/iota-framework/packages_compiled/iota-system b/crates/iota-framework/packages_compiled/iota-system index 48bf560bfc95fd13828fca05a72d0a67007600af..46a014072cf33c0824f33c4cda14fb60a0efc670 100644 GIT binary patch delta 367 zcmX?kfob;zrVXsjjPob6F)K)2`=(UuoX^wl@5; zH$M^7VMWm=E8eEWxO4InOC_m(365`?32fK24l{Di)XCv#)qSMM``k}}|NG_#mIj>2 z+9oHkiEK7>_E%usGr2KYQF5Cc#}AzZwi~+HT!-~CdDiGJ6X3mMuf_jo^X}w%?8rJd zr)5V;0R4BcSwZpxAIB!~1hz>MUR-x1IC!2&{9xm~BhSMBVDqo$RV*mFHg*_sGoGIO zWU_+fbasxLya{YO`9!$R@(J?X<6FhX+ab!v-?v$IN&!lsOrAAeNmL{xGdDFSKN%QM LNWpb^dYJ$K4QYQ& delta 372 zcmdmef$8K0rVXsjj0-2TF)K*j;NaNCm%uiS{{$n~Jpm`41%gYtd5_A-@ITz_z%0zn z%M)CZn4Oy9nO~9^X1Fr-iNj} z{Bt)y64YTu(|#7biDni%!m4D75)Z z2QN3{`N_8?D@e{}=eWz8z_yo9gzF-oAkQPdRcyRHqHO$=HVaQFKntMBebbc~#U^i@ TF2WRMIC<4Vsm=GN#|QubgkylP diff --git a/crates/iota-framework/published_api.txt b/crates/iota-framework/published_api.txt index 638c9ace52b..d243eb2ed97 100644 --- a/crates/iota-framework/published_api.txt +++ b/crates/iota-framework/published_api.txt @@ -22,7 +22,7 @@ StakingPoolV1 PoolTokenExchangeRateV1 public struct 0x3::staking_pool -StakedIotaV1 +StakedIota public struct 0x3::staking_pool new @@ -931,7 +931,7 @@ validator_voting_powers get_total_iota_supply public fun 0x3::iota_system -TimelockedStakedIotaV1 +TimelockedStakedIota public struct 0x3::timelocked_staking request_add_stake From ae76ef3d16000864b1d97bebb2a396b48f087baa Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 20:49:52 +0200 Subject: [PATCH 32/62] fix(iota-framework): update framework snapshots --- ...000000000000000000000000000000000000000003 | Bin 43178 -> 43164 bytes crates/iota-framework-snapshot/manifest.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 b/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 index ca20500cedcb362b66f37d3733f40fcbf4e85ba5..3f9c0e2c79589d6ed904d6da876eef3a9b65d9ea 100644 GIT binary patch delta 366 zcmZ2=k!j9FrVXmhjPoa}F)K)2`=(UuoX^wl@5; zH?s)ou%hU*6>n2w+&TG(rIJ*?1jjec1h#8hhZ(tM>g4dW>ONBBeeNf~|9z8{0VlGq z$qj5Gn**Kw6&UwSUYM*XxlNAahfV_94c%<6!+M!KYxI{1@Lsal;{UVxcJe%SWSyJa zvZEw`-h0@rAo+ohW0QCS+aw7ut~(MOJWnKku<_oJXW@UaS*m3f3yQ9b9Y)-Yrzf*a zQIMR@&T*4Bfo&(B2-jIYL7sbjtJruuMA`WJHrq}qKnat{yQV9NiiBk5rsm`)1H%a^ Kv_4PYE&u@I9DVcv delta 372 zcmbPpk!jUMrVXmhj0-2LF)K*j;NaNCm%uiS{{$n~Jpm`41%gYtd5_A-@ITy~z%0zn z%M)CZn4Oy9nO~9^X1KYI&4Ziq+2rGb3euZJI9ACeuyx7rW8^xaFo%)niQ->r-iNj} z{Bt)m3F)w+>9iDYQ)1jb`GBR8)Iq{#cyPk{gD=0BDO zoM;-&os$(9_f4LitSGrdj^me30^2R!Y_6kvnLO+CmkID*vDf1NxA|)FJa#mFb=gr8 zKtJAWR*?L}$FW5`fo+O}7uP)r4xVQcKiGKh$+Pf3+AP$viiI1=i<1{-i%#xaD75)a z2QN3{`N_W~D@e{}=eWz8z_yo9gzF-oAkQPdRcyRHqHO$=HXBbVKntMB>!vF)icP*a TU4$vjaPp~zQk(xzpDO?WssMqv diff --git a/crates/iota-framework-snapshot/manifest.json b/crates/iota-framework-snapshot/manifest.json index 01e27b8dc2d..be9f14fb5b9 100644 --- a/crates/iota-framework-snapshot/manifest.json +++ b/crates/iota-framework-snapshot/manifest.json @@ -1,6 +1,6 @@ { "1": { - "git_revision": "ae8fbd10da06", + "git_revision": "accd6a3a33ca-dirty", "package_ids": [ "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002", From 8854c10d97301f7d777d3dbf02cd55aa92cc44b0 Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 21:00:33 +0200 Subject: [PATCH 33/62] refactor(iota-types/events):rename SystemEpochInfoEvent to V1 --- crates/iota-core/src/authority.rs | 6 +++--- crates/iota-core/src/checkpoints/mod.rs | 4 ++-- crates/iota-indexer/src/handlers/checkpoint_handler.rs | 4 ++-- crates/iota-indexer/src/types.rs | 6 +++--- crates/iota-types/src/event.rs | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs index ce601453b0d..cf17b8c00f1 100644 --- a/crates/iota-core/src/authority.rs +++ b/crates/iota-core/src/authority.rs @@ -65,7 +65,7 @@ use iota_types::{ TransactionEvents, VerifiedCertifiedTransactionEffects, VerifiedSignedTransactionEffects, }, error::{ExecutionError, IotaError, IotaResult, UserInputError}, - event::{Event, EventID, SystemEpochInfoEvent}, + event::{Event, EventID, SystemEpochInfoEventV1}, executable_transaction::VerifiedExecutableTransaction, execution_config_utils::to_binary_config, execution_status::ExecutionStatus, @@ -4665,7 +4665,7 @@ impl AuthorityState { gas_cost_summary: &GasCostSummary, checkpoint: CheckpointSequenceNumber, epoch_start_timestamp_ms: CheckpointTimestamp, - ) -> anyhow::Result<(IotaSystemState, SystemEpochInfoEvent, TransactionEffects)> { + ) -> anyhow::Result<(IotaSystemState, SystemEpochInfoEventV1, TransactionEffects)> { let mut txns = Vec::new(); if let Some(tx) = self.create_authenticator_state_tx(epoch_store) { @@ -4809,7 +4809,7 @@ impl AuthorityState { .iter() .find(|event| event.is_system_epoch_info_event()) .expect("end of epoch tx must emit system epoch info event"); - let system_epoch_info_event = bcs::from_bytes::( + let system_epoch_info_event = bcs::from_bytes::( &system_epoch_info_event.contents, ) .expect("deserialization should succeed since we asserted that the event is of this type"); diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs index 36337630d58..ef37a074600 100644 --- a/crates/iota-core/src/checkpoints/mod.rs +++ b/crates/iota-core/src/checkpoints/mod.rs @@ -33,7 +33,7 @@ use iota_types::{ digests::{CheckpointContentsDigest, CheckpointDigest}, effects::{TransactionEffects, TransactionEffectsAPI}, error::{IotaError, IotaResult}, - event::SystemEpochInfoEvent, + event::SystemEpochInfoEventV1, executable_transaction::VerifiedExecutableTransaction, gas::GasCostSummary, iota_system_state::{ @@ -1592,7 +1592,7 @@ impl CheckpointBuilder { checkpoint_effects: &mut Vec, signatures: &mut Vec>, checkpoint: CheckpointSequenceNumber, - ) -> anyhow::Result<(IotaSystemState, SystemEpochInfoEvent)> { + ) -> anyhow::Result<(IotaSystemState, SystemEpochInfoEventV1)> { let (system_state, system_epoch_info_event, effects) = self .state .create_and_execute_advance_epoch_tx( diff --git a/crates/iota-indexer/src/handlers/checkpoint_handler.rs b/crates/iota-indexer/src/handlers/checkpoint_handler.rs index d6a7255322e..6eb5fd1d36d 100644 --- a/crates/iota-indexer/src/handlers/checkpoint_handler.rs +++ b/crates/iota-indexer/src/handlers/checkpoint_handler.rs @@ -18,7 +18,7 @@ use iota_types::{ base_types::ObjectID, dynamic_field::{DynamicFieldInfo, DynamicFieldName, DynamicFieldType}, effects::TransactionEffectsAPI, - event::SystemEpochInfoEvent, + event::SystemEpochInfoEventV1, iota_system_state::{ IotaSystemStateTrait, get_iota_system_state, iota_system_state_summary::IotaSystemStateSummary, @@ -239,7 +239,7 @@ where ) }); - let event = bcs::from_bytes::(&epoch_event.contents)?; + let event = bcs::from_bytes::(&epoch_event.contents)?; // Now we just entered epoch X, we want to calculate the diff between // TotalTransactionsByEndOfEpoch(X-1) and TotalTransactionsByEndOfEpoch(X-2). diff --git a/crates/iota-indexer/src/types.rs b/crates/iota-indexer/src/types.rs index d193e65da1e..1047811851a 100644 --- a/crates/iota-indexer/src/types.rs +++ b/crates/iota-indexer/src/types.rs @@ -11,7 +11,7 @@ use iota_types::{ digests::TransactionDigest, dynamic_field::DynamicFieldInfo, effects::TransactionEffects, - event::SystemEpochInfoEvent, + event::SystemEpochInfoEventV1, iota_serde::IotaStructTag, iota_system_state::iota_system_state_summary::IotaSystemStateSummary, messages_checkpoint::{ @@ -122,7 +122,7 @@ impl IndexedEpochInfo { pub fn from_new_system_state_summary( new_system_state_summary: IotaSystemStateSummary, first_checkpoint_id: u64, - event: Option<&SystemEpochInfoEvent>, + event: Option<&SystemEpochInfoEventV1>, ) -> IndexedEpochInfo { Self { epoch: new_system_state_summary.epoch, @@ -146,7 +146,7 @@ impl IndexedEpochInfo { pub fn from_end_of_epoch_data( system_state_summary: &IotaSystemStateSummary, last_checkpoint_summary: &CertifiedCheckpointSummary, - event: &SystemEpochInfoEvent, + event: &SystemEpochInfoEventV1, network_total_tx_num_at_last_epoch_end: u64, ) -> IndexedEpochInfo { Self { diff --git a/crates/iota-types/src/event.rs b/crates/iota-types/src/event.rs index ba43c026b35..f879bc64d2e 100755 --- a/crates/iota-types/src/event.rs +++ b/crates/iota-types/src/event.rs @@ -141,7 +141,7 @@ impl Event { pub fn is_system_epoch_info_event(&self) -> bool { self.type_.address == IOTA_SYSTEM_ADDRESS && self.type_.module.as_ident_str() == ident_str!("iota_system_state_inner") - && self.type_.name.as_ident_str() == ident_str!("SystemEpochInfoEvent") + && self.type_.name.as_ident_str() == ident_str!("SystemEpochInfoEventV1") } } @@ -164,7 +164,7 @@ impl Event { // Event emitted in move code `fun advance_epoch` #[derive(Deserialize)] -pub struct SystemEpochInfoEvent { +pub struct SystemEpochInfoEventV1 { pub epoch: u64, pub protocol_version: u64, pub reference_gas_price: u64, From e6e0a495cc2e1a946480a266a6da7bec76e35184 Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 21:12:42 +0200 Subject: [PATCH 34/62] refactor(iota-types): remove version from PoolTokenExchangeRate --- .../iota-system/sources/iota_system.move | 4 +-- .../sources/iota_system_state_inner.move | 4 +-- .../iota-system/sources/staking_pool.move | 24 ++++++++--------- .../iota-system/sources/validator.move | 4 +-- .../iota-system/sources/validator_set.move | 6 ++--- .../iota-system/tests/delegation_tests.move | 4 +-- .../tests/timelocked_delegation_tests.move | 4 +-- .../packages_compiled/iota-system | Bin 43067 -> 43057 bytes crates/iota-framework/published_api.txt | 2 +- .../iota-indexer/src/apis/governance_api.rs | 5 +--- crates/iota-json-rpc/src/governance_api.rs | 4 +-- .../iota-types/src/iota_system_state/mod.rs | 25 +++--------------- 12 files changed, 32 insertions(+), 54 deletions(-) diff --git a/crates/iota-framework/packages/iota-system/sources/iota_system.move b/crates/iota-framework/packages/iota-system/sources/iota_system.move index 38d7de673cd..0737026db93 100644 --- a/crates/iota-framework/packages/iota-system/sources/iota_system.move +++ b/crates/iota-framework/packages/iota-system/sources/iota_system.move @@ -50,7 +50,7 @@ module iota_system::iota_system { use iota_system::validator::ValidatorV1; use iota_system::validator_cap::UnverifiedValidatorOperationCap; use iota_system::iota_system_state_inner::{Self, SystemParametersV1, IotaSystemStateV1}; - use iota_system::staking_pool::PoolTokenExchangeRateV1; + use iota_system::staking_pool::PoolTokenExchangeRate; use iota::dynamic_field; use iota::vec_map::VecMap; @@ -514,7 +514,7 @@ module iota_system::iota_system { public fun pool_exchange_rates( wrapper: &mut IotaSystemState, pool_id: &ID - ): &Table { + ): &Table { let self = load_system_state_mut(wrapper); self.pool_exchange_rates(pool_id) } diff --git a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move index 54d2253e7a6..fb8d9a8943d 100644 --- a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move +++ b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move @@ -11,7 +11,7 @@ module iota_system::iota_system_state_inner { use iota_system::validator_set::{Self, ValidatorSetV1}; use iota_system::validator_cap::{UnverifiedValidatorOperationCap, ValidatorOperationCap}; use iota_system::storage_fund::{Self, StorageFundV1}; - use iota_system::staking_pool::PoolTokenExchangeRateV1; + use iota_system::staking_pool::PoolTokenExchangeRate; use iota::vec_map::{Self, VecMap}; use iota::vec_set::{Self, VecSet}; use iota::event; @@ -873,7 +873,7 @@ module iota_system::iota_system_state_inner { public(package) fun pool_exchange_rates( self: &mut IotaSystemStateV1, pool_id: &ID - ): &Table { + ): &Table { let validators = &mut self.validators; validators.pool_exchange_rates(pool_id) } diff --git a/crates/iota-framework/packages/iota-system/sources/staking_pool.move b/crates/iota-framework/packages/iota-system/sources/staking_pool.move index 5f26a9f289c..4c1d1123f04 100644 --- a/crates/iota-framework/packages/iota-system/sources/staking_pool.move +++ b/crates/iota-framework/packages/iota-system/sources/staking_pool.move @@ -52,7 +52,7 @@ module iota_system::staking_pool { /// Exchange rate history of previous epochs. Key is the epoch number. /// The entries start from the `activation_epoch` of this pool and contains exchange rates at the beginning of each epoch, /// i.e., right after the rewards for the previous epoch have been deposited into the pool. - exchange_rates: Table, + exchange_rates: Table, /// Pending stake amount for this epoch, emptied at epoch boundaries. pending_stake: u64, /// Pending stake withdrawn during the current epoch, emptied at epoch boundaries. @@ -65,7 +65,7 @@ module iota_system::staking_pool { } /// Struct representing the exchange rate of the stake pool token to IOTA. - public struct PoolTokenExchangeRateV1 has store, copy, drop { + public struct PoolTokenExchangeRate has store, copy, drop { iota_amount: u64, pool_token_amount: u64, } @@ -211,7 +211,7 @@ module iota_system::staking_pool { process_pending_stake(pool); pool.exchange_rates.add( new_epoch, - PoolTokenExchangeRateV1 { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }, + PoolTokenExchangeRate { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }, ); check_balance_invariants(pool, new_epoch); } @@ -229,7 +229,7 @@ module iota_system::staking_pool { public(package) fun process_pending_stake(pool: &mut StakingPoolV1) { // Use the most up to date exchange rate with the rewards deposited and withdraws effectuated. let latest_exchange_rate = - PoolTokenExchangeRateV1 { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }; + PoolTokenExchangeRate { iota_amount: pool.iota_balance, pool_token_amount: pool.pool_token_balance }; pool.iota_balance = pool.iota_balance + pool.pending_stake; pool.pool_token_balance = get_token_amount(&latest_exchange_rate, pool.iota_balance); pool.pending_stake = 0; @@ -364,7 +364,7 @@ module iota_system::staking_pool { (self.stake_activation_epoch == other.stake_activation_epoch) } - public fun pool_token_exchange_rate_at_epoch(pool: &StakingPoolV1, epoch: u64): PoolTokenExchangeRateV1 { + public fun pool_token_exchange_rate_at_epoch(pool: &StakingPoolV1, epoch: u64): PoolTokenExchangeRate { // If the pool is preactive then the exchange rate is always 1:1. if (is_preactive_at_epoch(pool, epoch)) { return initial_exchange_rate() @@ -394,15 +394,15 @@ module iota_system::staking_pool { staking_pool.pending_total_iota_withdraw } - public(package) fun exchange_rates(pool: &StakingPoolV1): &Table { + public(package) fun exchange_rates(pool: &StakingPoolV1): &Table { &pool.exchange_rates } - public fun iota_amount(exchange_rate: &PoolTokenExchangeRateV1): u64 { + public fun iota_amount(exchange_rate: &PoolTokenExchangeRate): u64 { exchange_rate.iota_amount } - public fun pool_token_amount(exchange_rate: &PoolTokenExchangeRateV1): u64 { + public fun pool_token_amount(exchange_rate: &PoolTokenExchangeRate): u64 { exchange_rate.pool_token_amount } @@ -412,7 +412,7 @@ module iota_system::staking_pool { is_preactive(pool) || (*pool.activation_epoch.borrow() > epoch) } - fun get_iota_amount(exchange_rate: &PoolTokenExchangeRateV1, token_amount: u64): u64 { + fun get_iota_amount(exchange_rate: &PoolTokenExchangeRate, token_amount: u64): u64 { // When either amount is 0, that means we have no stakes with this pool. // The other amount might be non-zero when there's dust left in the pool. if (exchange_rate.iota_amount == 0 || exchange_rate.pool_token_amount == 0) { @@ -424,7 +424,7 @@ module iota_system::staking_pool { res as u64 } - fun get_token_amount(exchange_rate: &PoolTokenExchangeRateV1, iota_amount: u64): u64 { + fun get_token_amount(exchange_rate: &PoolTokenExchangeRate, iota_amount: u64): u64 { // When either amount is 0, that means we have no stakes with this pool. // The other amount might be non-zero when there's dust left in the pool. if (exchange_rate.iota_amount == 0 || exchange_rate.pool_token_amount == 0) { @@ -436,8 +436,8 @@ module iota_system::staking_pool { res as u64 } - fun initial_exchange_rate(): PoolTokenExchangeRateV1 { - PoolTokenExchangeRateV1 { iota_amount: 0, pool_token_amount: 0 } + fun initial_exchange_rate(): PoolTokenExchangeRate { + PoolTokenExchangeRate { iota_amount: 0, pool_token_amount: 0 } } fun check_balance_invariants(pool: &StakingPoolV1, epoch: u64) { diff --git a/crates/iota-framework/packages/iota-system/sources/validator.move b/crates/iota-framework/packages/iota-system/sources/validator.move index 028dd0a6a5a..c37c4242e94 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator.move +++ b/crates/iota-framework/packages/iota-system/sources/validator.move @@ -9,7 +9,7 @@ module iota_system::validator { use iota::balance::Balance; use iota::iota::IOTA; use iota_system::validator_cap::{Self, ValidatorOperationCap}; - use iota_system::staking_pool::{Self, PoolTokenExchangeRateV1, StakedIota, StakingPoolV1}; + use iota_system::staking_pool::{Self, PoolTokenExchangeRate, StakedIota, StakingPoolV1}; use std::string::String; use iota::url::Url; use iota::url; @@ -566,7 +566,7 @@ module iota_system::validator { self.commission_rate } - public fun pool_token_exchange_rate_at_epoch(self: &ValidatorV1, epoch: u64): PoolTokenExchangeRateV1 { + public fun pool_token_exchange_rate_at_epoch(self: &ValidatorV1, epoch: u64): PoolTokenExchangeRate { self.staking_pool.pool_token_exchange_rate_at_epoch(epoch) } diff --git a/crates/iota-framework/packages/iota-system/sources/validator_set.move b/crates/iota-framework/packages/iota-system/sources/validator_set.move index 1f59425605c..a725dbc3a6a 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator_set.move +++ b/crates/iota-framework/packages/iota-system/sources/validator_set.move @@ -8,7 +8,7 @@ module iota_system::validator_set { use iota::iota::IOTA; use iota_system::validator::{ValidatorV1, staking_pool_id, iota_address}; use iota_system::validator_cap::{Self, UnverifiedValidatorOperationCap, ValidatorOperationCap}; - use iota_system::staking_pool::{PoolTokenExchangeRateV1, StakedIota, pool_id}; + use iota_system::staking_pool::{PoolTokenExchangeRate, StakedIota, pool_id}; use iota::priority_queue as pq; use iota::vec_map::{Self, VecMap}; use iota::vec_set::VecSet; @@ -69,7 +69,7 @@ module iota_system::validator_set { voting_power: u64, commission_rate: u64, pool_staking_reward: u64, - pool_token_exchange_rate: PoolTokenExchangeRateV1, + pool_token_exchange_rate: PoolTokenExchangeRate, tallying_rule_reporters: vector
, tallying_rule_global_score: u64, } @@ -525,7 +525,7 @@ module iota_system::validator_set { public(package) fun pool_exchange_rates( self: &mut ValidatorSetV1, pool_id: &ID - ) : &Table { + ) : &Table { let validator = // If the pool id is recorded in the mapping, then it must be either candidate or active. if (self.staking_pool_mappings.contains(*pool_id)) { diff --git a/crates/iota-framework/packages/iota-system/tests/delegation_tests.move b/crates/iota-framework/packages/iota-system/tests/delegation_tests.move index 0a8ff9e2811..7a233847c4f 100644 --- a/crates/iota-framework/packages/iota-system/tests/delegation_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/delegation_tests.move @@ -7,7 +7,7 @@ module iota_system::stake_tests { use iota::coin; use iota::test_scenario; use iota_system::iota_system::IotaSystemState; - use iota_system::staking_pool::{Self, StakedIota, PoolTokenExchangeRateV1}; + use iota_system::staking_pool::{Self, StakedIota, PoolTokenExchangeRate}; use iota::test_utils::assert_eq; use iota_system::validator_set; use iota::test_utils; @@ -534,7 +534,7 @@ module iota_system::stake_tests { } fun assert_exchange_rate_eq( - rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 + rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 ) { let rate = &rates[epoch]; assert_eq(rate.iota_amount(), iota_amount * NANOS_PER_IOTA); diff --git a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move index de1802ca944..e7d1ba96f28 100644 --- a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move @@ -14,7 +14,7 @@ module iota_system::timelocked_stake_tests { use iota::test_utils; use iota_system::iota_system::IotaSystemState; - use iota_system::staking_pool::{Self, PoolTokenExchangeRateV1}; + use iota_system::staking_pool::{Self, PoolTokenExchangeRate}; use iota_system::validator_set::{Self, ValidatorSetV1}; use iota_system::governance_test_utils::{ add_validator, @@ -987,7 +987,7 @@ module iota_system::timelocked_stake_tests { } fun assert_exchange_rate_eq( - rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 + rates: &Table, epoch: u64, iota_amount: u64, pool_token_amount: u64 ) { let rate = &rates[epoch]; assert_eq(rate.iota_amount(), iota_amount * NANOS_PER_IOTA); diff --git a/crates/iota-framework/packages_compiled/iota-system b/crates/iota-framework/packages_compiled/iota-system index 46a014072cf33c0824f33c4cda14fb60a0efc670..9333d70081af8ae444c6b67f0dd9076f672ff4c0 100644 GIT binary patch delta 342 zcmdmefobCfrVXsjjB_WmF)K)2;o#WBm%uiO{{$n~EdeKA~_>5FFiFVu_SdepSa}a95yR%#z&Kv3o1yj7vWeYm%!F0zmJjY zh{7C3o(GD5rFrk#+VIcZ{76uQ6^AjK`NStGF>ar{z*0%7SAyezw;QzY$jwKf-E))Ja)hICTnp~Z%D7i(BA~_>5FFiFVu_QIjaC0DAFgN3q$x8(lq&JFitdL7!>yY2a$aPF% z4kOPa#lO_PM%|_B-Jm$@l7*I`w8%W-+aT8ixa0gn}0afC@}7sT$-#XxlNAahfV_94c%<6!+M!KYxI{1 z@Lsal;{UUGeR3N+ZX>+2Qzd|5vawk~@&g~oCh-KeNfKUMcO*D?o=E&) f64; -} - -#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] -#[enum_dispatch(PoolTokenExchangeRateTrait)] -pub enum PoolTokenExchangeRate { - V1(PoolTokenExchangeRateV1), -} - #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Default)] -pub struct PoolTokenExchangeRateV1 { +pub struct PoolTokenExchangeRate { iota_amount: u64, pool_token_amount: u64, } -impl PoolTokenExchangeRateTrait for PoolTokenExchangeRateV1 { +impl PoolTokenExchangeRate { /// Rate of the staking pool, pool token amount : Iota amount - fn rate(&self) -> f64 { + pub fn rate(&self) -> f64 { if self.iota_amount == 0 { 1_f64 } else { @@ -417,12 +404,6 @@ impl PoolTokenExchangeRateTrait for PoolTokenExchangeRateV1 { } } -impl Default for PoolTokenExchangeRate { - fn default() -> Self { - PoolTokenExchangeRate::V1(PoolTokenExchangeRateV1::default()) - } -} - #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)] pub struct Validator { pub inner: Versioned, From 5f4eb1c4bbfe14d9df007bc4b6529b1ac8cce072 Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 21:13:38 +0200 Subject: [PATCH 35/62] fix(iota-framework): update framework snapshots second time --- ...000000000000000000000000000000000000000003 | Bin 43164 -> 43154 bytes crates/iota-framework-snapshot/manifest.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 b/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 index 3f9c0e2c79589d6ed904d6da876eef3a9b65d9ea..9830507bb7cc1f2e69a926f862955668fb430c93 100644 GIT binary patch delta 342 zcmbPpk!jLJrVXmhjB_WeF)K)2;o#WBm%uiO{{$n~EdeK!2Fv@ zOf(=rKPMzVJ2lU>A~_>5FFiFVu_Se}p19=Z9yTj(#z&Kn3o1yj7vWeYm%!F0zmJjY zh{7C3o(GD5rFrk#+VIcZ%p@ejio=-Adg2q67`IP8V5ub4E5Y$aGlA`j)?r4j={h+) z&AN{id7t_T@PFO>$C8T^mkDytH42QoCeKb*l-wf6@l7Xz?V4^j*Fn8Zo>ltG1b8pl zYw`cud^Nd^9hU*c*{Kr1u(;W*Ao-4uV}p1C+XM+Ou3HiuJdY%Pu<_oKXW_rMS*T?a M3oZlpbUcs;0P13SlK=n! delta 366 zcmbPqk!j9FrVXmhjPoa}F)K)2A~_>5FFiFVu_QIjaC0GBFgN3q$wvhhq&JFitdL7!>yY2a$aPF% z4kOPa#lOX+d7rkTKYP3tft*G!!p zo>tvQioDPL1o*#i{$a_*iPN0T63#UWjC&?eO;(iLCdctZCxPvTZZ_9py-c1p`pX1( zFWGDH|Ji&#xs4sS5!u Date: Wed, 23 Oct 2024 21:14:55 +0200 Subject: [PATCH 36/62] chore: fix comments mentioning StakingPool move type --- crates/iota-graphql-rpc/schema.graphql | 2 +- crates/iota-graphql-rpc/src/types/validator.rs | 2 +- .../tests/snapshots/snapshot_tests__schema_sdl_export.snap | 2 +- sdk/graphql-transport/src/generated/queries.ts | 2 +- sdk/typescript/src/graphql/generated/2024.10/schema.graphql | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/iota-graphql-rpc/schema.graphql b/crates/iota-graphql-rpc/schema.graphql index 4a94721baf3..a280da6ce7b 100644 --- a/crates/iota-graphql-rpc/schema.graphql +++ b/crates/iota-graphql-rpc/schema.graphql @@ -4400,7 +4400,7 @@ type Validator { """ stakingPool: MoveObject @deprecated(reason: "The staking pool is a wrapped object. Access its fields directly on the `Validator` type.") """ - The ID of this validator's `0x3::staking_pool::StakingPool`. + The ID of this validator's `0x3::staking_pool::StakingPoolV1`. """ stakingPoolId: IotaAddress! """ diff --git a/crates/iota-graphql-rpc/src/types/validator.rs b/crates/iota-graphql-rpc/src/types/validator.rs index f590b6aafbe..87918dcdb04 100644 --- a/crates/iota-graphql-rpc/src/types/validator.rs +++ b/crates/iota-graphql-rpc/src/types/validator.rs @@ -215,7 +215,7 @@ impl Validator { Ok(None) } - /// The ID of this validator's `0x3::staking_pool::StakingPool`. + /// The ID of this validator's `0x3::staking_pool::StakingPoolV1`. async fn staking_pool_id(&self) -> IotaAddress { self.validator_summary.staking_pool_id.into() } diff --git a/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap b/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap index 79aec2555f9..c8f5f56ff8d 100644 --- a/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap +++ b/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap @@ -4404,7 +4404,7 @@ type Validator { """ stakingPool: MoveObject @deprecated(reason: "The staking pool is a wrapped object. Access its fields directly on the `Validator` type.") """ - The ID of this validator's `0x3::staking_pool::StakingPool`. + The ID of this validator's `0x3::staking_pool::StakingPoolV1`. """ stakingPoolId: IotaAddress! """ diff --git a/sdk/graphql-transport/src/generated/queries.ts b/sdk/graphql-transport/src/generated/queries.ts index 5465b305677..e6b402b88c8 100644 --- a/sdk/graphql-transport/src/generated/queries.ts +++ b/sdk/graphql-transport/src/generated/queries.ts @@ -5018,7 +5018,7 @@ export type Validator = { stakingPool?: Maybe; /** The epoch at which this pool became active. */ stakingPoolActivationEpoch?: Maybe; - /** The ID of this validator's `0x3::staking_pool::StakingPool`. */ + /** The ID of this validator's `0x3::staking_pool::StakingPoolV1`. */ stakingPoolId: Scalars['IotaAddress']['output']; /** The total number of IOTA tokens in this pool. */ stakingPoolIotaBalance?: Maybe; diff --git a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql index 4a94721baf3..a280da6ce7b 100644 --- a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql +++ b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql @@ -4400,7 +4400,7 @@ type Validator { """ stakingPool: MoveObject @deprecated(reason: "The staking pool is a wrapped object. Access its fields directly on the `Validator` type.") """ - The ID of this validator's `0x3::staking_pool::StakingPool`. + The ID of this validator's `0x3::staking_pool::StakingPoolV1`. """ stakingPoolId: IotaAddress! """ From 749a356cc0bfa54f2b4eaa12a5f425cc6ea786ca Mon Sep 17 00:00:00 2001 From: miker83z Date: Wed, 23 Oct 2024 21:16:52 +0200 Subject: [PATCH 37/62] chore: fix comments mentioning SystemEpochInfoEvent move type --- crates/iota-core/src/authority.rs | 2 +- crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs | 2 +- .../migrations/mysql/2024-04-24-180207_epochs/up.sql | 2 +- .../iota-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql | 2 +- crates/iota-indexer/src/handlers/checkpoint_handler.rs | 2 +- crates/iota-json-rpc-types/src/iota_extended.rs | 2 +- crates/iota-open-rpc/spec/openrpc.json | 2 +- crates/iota-replay/src/types.rs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs index cf17b8c00f1..e722d78d4c8 100644 --- a/crates/iota-core/src/authority.rs +++ b/crates/iota-core/src/authority.rs @@ -4802,7 +4802,7 @@ impl AuthorityState { self.prepare_certificate(&execution_guard, &executable_tx, input_objects, epoch_store)?; let system_obj = get_iota_system_state(&temporary_store.written) .expect("change epoch tx must write to system object"); - // Find the SystemEpochInfoEvent emitted by the advance_epoch transaction. + // Find the SystemEpochInfoEventV1 emitted by the advance_epoch transaction. let system_epoch_info_event = temporary_store .events .data diff --git a/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs b/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs index 0a3c5b1fcf9..9dd7463d1a5 100644 --- a/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs +++ b/crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs @@ -466,7 +466,7 @@ async fn sync_end_of_epoch_checkpoint( epoch_commitments: vec![ECMHLiveObjectSetDigest::default().into()], // Do not simulate supply changes in tests. // We would need to build this checkpoint after the below execution of advance_epoch to - // obtain this number from the SystemEpochInfoEvent. + // obtain this number from the SystemEpochInfoEventV1. epoch_supply_change: 0, }), ); diff --git a/crates/iota-indexer/migrations/mysql/2024-04-24-180207_epochs/up.sql b/crates/iota-indexer/migrations/mysql/2024-04-24-180207_epochs/up.sql index 2dcb4d7c53d..396b8ee2511 100644 --- a/crates/iota-indexer/migrations/mysql/2024-04-24-180207_epochs/up.sql +++ b/crates/iota-indexer/migrations/mysql/2024-04-24-180207_epochs/up.sql @@ -13,7 +13,7 @@ CREATE TABLE epochs epoch_total_transactions BIGINT, last_checkpoint_id BIGINT, epoch_end_timestamp BIGINT, - -- The following fields are from SystemEpochInfoEvent emitted + -- The following fields are from SystemEpochInfoEventV1 emitted -- **after** advancing to the next epoch storage_fund_reinvestment BIGINT, storage_charge BIGINT, diff --git a/crates/iota-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql b/crates/iota-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql index 5b540121cb8..1a3a946f5ae 100644 --- a/crates/iota-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql +++ b/crates/iota-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql @@ -13,7 +13,7 @@ CREATE TABLE epochs epoch_total_transactions BIGINT, last_checkpoint_id BIGINT, epoch_end_timestamp BIGINT, - -- The following fields are from SystemEpochInfoEvent emitted + -- The following fields are from SystemEpochInfoEventV1 emitted -- **after** advancing to the next epoch storage_fund_reinvestment BIGINT, storage_charge BIGINT, diff --git a/crates/iota-indexer/src/handlers/checkpoint_handler.rs b/crates/iota-indexer/src/handlers/checkpoint_handler.rs index 6eb5fd1d36d..9d227892f54 100644 --- a/crates/iota-indexer/src/handlers/checkpoint_handler.rs +++ b/crates/iota-indexer/src/handlers/checkpoint_handler.rs @@ -234,7 +234,7 @@ where .find(|ev| ev.is_system_epoch_info_event()) .unwrap_or_else(|| { panic!( - "Can't find SystemEpochInfoEvent in epoch end checkpoint {}", + "Can't find SystemEpochInfoEventV1 in epoch end checkpoint {}", checkpoint_summary.sequence_number() ) }); diff --git a/crates/iota-json-rpc-types/src/iota_extended.rs b/crates/iota-json-rpc-types/src/iota_extended.rs index 95b5b54507f..943aff3f73b 100644 --- a/crates/iota-json-rpc-types/src/iota_extended.rs +++ b/crates/iota-json-rpc-types/src/iota_extended.rs @@ -96,7 +96,7 @@ pub struct EndOfEpochInfo { #[schemars(with = "BigInt")] #[serde_as(as = "BigInt")] pub epoch_end_timestamp: u64, - /// existing fields from `SystemEpochInfoEvent` (without epoch) + /// existing fields from `SystemEpochInfoEventV1` (without epoch) #[schemars(with = "BigInt")] #[serde_as(as = "BigInt")] pub protocol_version: u64, diff --git a/crates/iota-open-rpc/spec/openrpc.json b/crates/iota-open-rpc/spec/openrpc.json index f4c6899650f..5beba2a9c77 100644 --- a/crates/iota-open-rpc/spec/openrpc.json +++ b/crates/iota-open-rpc/spec/openrpc.json @@ -6595,7 +6595,7 @@ "$ref": "#/components/schemas/BigInt_for_uint64" }, "protocolVersion": { - "description": "existing fields from `SystemEpochInfoEvent` (without epoch)", + "description": "existing fields from `SystemEpochInfoEventV1` (without epoch)", "allOf": [ { "$ref": "#/components/schemas/BigInt_for_uint64" diff --git a/crates/iota-replay/src/types.rs b/crates/iota-replay/src/types.rs index d10d2519f4d..11ca9df050c 100644 --- a/crates/iota-replay/src/types.rs +++ b/crates/iota-replay/src/types.rs @@ -34,7 +34,7 @@ pub(crate) const MAX_CONCURRENT_REQUESTS: usize = 1_000; // Struct tag used in system epoch change events pub(crate) const EPOCH_CHANGE_STRUCT_TAG: &str = - "0x3::iota_system_state_inner::SystemEpochInfoEvent"; + "0x3::iota_system_state_inner::SystemEpochInfoEventV1"; // TODO: A lot of the information in OnChainTransactionInfo is redundant from // what's already in SenderSignedData. We should consider removing them. From 696401dd0cb68b705d6dbe89c47573bdb56b212a Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 10:02:01 +0200 Subject: [PATCH 38/62] fix(iota-graphql-rpc): schema) --- crates/iota-graphql-rpc/schema.graphql | 6 +++--- .../tests/snapshots/snapshot_tests__schema_sdl_export.snap | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/iota-graphql-rpc/schema.graphql b/crates/iota-graphql-rpc/schema.graphql index a280da6ce7b..bdb8f7bfda3 100644 --- a/crates/iota-graphql-rpc/schema.graphql +++ b/crates/iota-graphql-rpc/schema.graphql @@ -191,7 +191,7 @@ type AuthenticatorStateExpireTransaction { """ minEpoch: Epoch """ - The initial version that the AuthenticatorStateUpdate was shared at. + The initial version that the AuthenticatorStateUpdateV1 was shared at. """ authenticatorObjInitialSharedVersion: UInt53! } @@ -199,7 +199,7 @@ type AuthenticatorStateExpireTransaction { """ System transaction for updating the on-chain state used by zkLogin. """ -type AuthenticatorStateUpdateTransaction { +type AuthenticatorStateUpdateV1Transaction { """ Epoch of the authenticator state update transaction. """ @@ -4194,7 +4194,7 @@ input TransactionBlockFilter { The kind of transaction block, either a programmable transaction or a system transaction. """ -union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateTransaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction +union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateV1Transaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction """ An input filter selecting for either system or programmable transactions. diff --git a/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap b/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap index c8f5f56ff8d..5d4a3e85319 100644 --- a/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap +++ b/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap @@ -195,7 +195,7 @@ type AuthenticatorStateExpireTransaction { """ minEpoch: Epoch """ - The initial version that the AuthenticatorStateUpdate was shared at. + The initial version that the AuthenticatorStateUpdateV1 was shared at. """ authenticatorObjInitialSharedVersion: UInt53! } @@ -203,7 +203,7 @@ type AuthenticatorStateExpireTransaction { """ System transaction for updating the on-chain state used by zkLogin. """ -type AuthenticatorStateUpdateTransaction { +type AuthenticatorStateUpdateV1Transaction { """ Epoch of the authenticator state update transaction. """ @@ -4198,7 +4198,7 @@ input TransactionBlockFilter { The kind of transaction block, either a programmable transaction or a system transaction. """ -union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateTransaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction +union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateV1Transaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction """ An input filter selecting for either system or programmable transactions. From a958d52490b55b369e2fe09231796ea8f0de27bd Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 10:29:08 +0200 Subject: [PATCH 39/62] fix(iota-graphql-e2e-test): update baselines + fix staked_iota.move --- .../tests/available_range/available_range.exp | 16 +- .../tests/call/dynamic_fields.exp | 60 +- .../tests/call/simple.exp | 58 +- .../tests/consistency/balances.exp | 40 +- .../checkpoints/transaction_blocks.exp | 36 +- .../tests/consistency/coins.exp | 250 +++---- .../consistency/dynamic_fields/deleted_df.exp | 86 +-- .../dynamic_fields/deleted_dof.exp | 18 +- .../dof_add_reclaim_transfer.exp | 20 +- .../dof_add_reclaim_transfer_reclaim_add.exp | 24 +- .../dynamic_fields/dynamic_fields.exp | 351 +++------ .../dynamic_fields/immutable_dof.exp | 22 +- .../consistency/dynamic_fields/mutated_df.exp | 28 +- .../dynamic_fields/mutated_dof.exp | 30 +- .../consistency/dynamic_fields/nested_dof.exp | 32 +- .../consistency/epochs/transaction_blocks.exp | 216 +++--- .../tests/consistency/object_at_version.exp | 16 +- .../tests/consistency/objects_pagination.exp | 240 +++--- .../consistency/objects_pagination_single.exp | 150 ++-- .../consistency/performance/many_objects.exp | 132 ++-- .../tests/consistency/staked_iota.exp | 40 +- .../tests/consistency/staked_iota.move | 22 +- .../tests/consistency/tx_address_objects.exp | 690 +++++++++--------- .../tests/epoch/chain_identifier.exp | 2 +- .../tests/epoch/epoch.exp | 10 +- .../tests/epoch/system_state.exp | 28 +- .../tests/errors/clever_errors.exp | 40 +- .../tests/errors/clever_errors_in_macros.exp | 6 +- .../event_connection/event_connection.exp | 24 +- .../event_connection/nested_emit_event.exp | 6 +- .../tests/event_connection/no_filter.exp | 4 +- .../tests/event_connection/pagination.exp | 18 +- .../tests/event_connection/tx_digest.exp | 10 +- .../tests/event_connection/type_filter.exp | 16 +- .../event_connection/type_param_filter.exp | 22 +- .../tests/limits/directives.exp | 4 +- .../tests/limits/output_node_estimation.exp | 26 +- .../tests/objects/coin.exp | 36 +- .../tests/objects/data.exp | 332 ++++----- .../tests/objects/display.exp | 18 +- .../tests/objects/enum_data.exp | 332 ++++----- .../tests/objects/filter_by_type.exp | 32 +- .../tests/objects/pagination.exp | 67 +- .../tests/objects/public_transfer.exp | 10 +- .../tests/objects/received.exp | 2 +- .../tests/objects/staked_iota.exp | 32 +- .../tests/owner/downcasts.exp | 2 +- .../tests/owner/root_version.exp | 32 +- .../tests/packages/datatypes.exp | 4 +- .../tests/packages/enums.exp | 32 +- .../tests/packages/friends.exp | 70 +- .../tests/packages/functions.exp | 38 +- .../tests/packages/modules.exp | 18 +- .../tests/packages/structs.exp | 42 +- .../tests/packages/types.exp | 2 +- .../tests/packages/versioning.exp | 64 +- .../balance_changes.exp | 18 +- .../dependencies.exp | 10 +- .../tests/transactions/at_checkpoint.exp | 12 +- .../tests/transactions/errors.exp | 4 +- .../tests/transactions/filters/kind.exp | 20 +- .../tests/transactions/programmable.exp | 162 ++-- .../tests/transactions/random.exp | 2 +- .../transactions/scan_limit/alternating.exp | 18 +- .../transactions/scan_limit/both_cursors.exp | 8 +- .../transactions/scan_limit/equal/first.exp | 24 +- .../transactions/scan_limit/equal/last.exp | 20 +- .../transactions/scan_limit/ge_page/first.exp | 20 +- .../transactions/scan_limit/ge_page/last.exp | 16 +- .../transactions/scan_limit/le_page/first.exp | 30 +- .../transactions/scan_limit/le_page/last.exp | 30 +- .../tests/transactions/scan_limit/require.exp | 82 +-- .../tests/transactions/shared.exp | 16 +- .../tests/transactions/system.exp | 472 ++++++------ 74 files changed, 2404 insertions(+), 2518 deletions(-) diff --git a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp index 754961aae97..b0b5377ae45 100644 --- a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp +++ b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp @@ -6,20 +6,20 @@ Response: { "data": { "availableRange": { "first": { - "digest": "7GqDJnD2N6yvWc8bGS1L3ZLYYiX6n7dDWs3mbaXMKtkj", + "digest": "nRKQ1Yr3sjWLTWfCGaKwRbGwfUdY8eLv1yAL4VwbQLf", "sequenceNumber": 0 }, "last": { - "digest": "7GqDJnD2N6yvWc8bGS1L3ZLYYiX6n7dDWs3mbaXMKtkj", + "digest": "nRKQ1Yr3sjWLTWfCGaKwRbGwfUdY8eLv1yAL4VwbQLf", "sequenceNumber": 0 } }, "first": { - "digest": "7GqDJnD2N6yvWc8bGS1L3ZLYYiX6n7dDWs3mbaXMKtkj", + "digest": "nRKQ1Yr3sjWLTWfCGaKwRbGwfUdY8eLv1yAL4VwbQLf", "sequenceNumber": 0 }, "last": { - "digest": "7GqDJnD2N6yvWc8bGS1L3ZLYYiX6n7dDWs3mbaXMKtkj", + "digest": "nRKQ1Yr3sjWLTWfCGaKwRbGwfUdY8eLv1yAL4VwbQLf", "sequenceNumber": 0 } } @@ -39,20 +39,20 @@ Response: { "data": { "availableRange": { "first": { - "digest": "7GqDJnD2N6yvWc8bGS1L3ZLYYiX6n7dDWs3mbaXMKtkj", + "digest": "nRKQ1Yr3sjWLTWfCGaKwRbGwfUdY8eLv1yAL4VwbQLf", "sequenceNumber": 0 }, "last": { - "digest": "BPDjFsHbzmTyxsZq12R48ZSrnVLEDumZYpDKjx16RkhL", + "digest": "SUWRmPTNg5oT2BEw4wajeaDPeLNeKmSwUPUBUPBpz4b", "sequenceNumber": 2 } }, "first": { - "digest": "7GqDJnD2N6yvWc8bGS1L3ZLYYiX6n7dDWs3mbaXMKtkj", + "digest": "nRKQ1Yr3sjWLTWfCGaKwRbGwfUdY8eLv1yAL4VwbQLf", "sequenceNumber": 0 }, "last": { - "digest": "BPDjFsHbzmTyxsZq12R48ZSrnVLEDumZYpDKjx16RkhL", + "digest": "SUWRmPTNg5oT2BEw4wajeaDPeLNeKmSwUPUBUPBpz4b", "sequenceNumber": 2 } } diff --git a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp index 352b6e239a1..ac5febe53b2 100644 --- a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp +++ b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp @@ -41,10 +41,10 @@ Response: { { "name": { "type": { - "repr": "vector" + "repr": "bool" }, "data": { - "Vector": [] + "Bool": false }, "bcs": "AA==" }, @@ -55,12 +55,12 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { "__typename": "MoveValue" @@ -83,12 +83,12 @@ Response: { { "name": { "type": { - "repr": "bool" + "repr": "u64" }, "data": { - "Bool": false + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { "__typename": "MoveValue" @@ -121,10 +121,10 @@ Response: { { "name": { "type": { - "repr": "vector" + "repr": "bool" }, "data": { - "Vector": [] + "Bool": false }, "bcs": "AA==" }, @@ -135,12 +135,12 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { "__typename": "MoveValue" @@ -163,12 +163,12 @@ Response: { { "name": { "type": { - "repr": "bool" + "repr": "u64" }, "data": { - "Bool": false + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { "__typename": "MoveValue" @@ -190,17 +190,17 @@ Response: { { "name": { "type": { - "repr": "vector" + "repr": "bool" }, "data": { - "Vector": [] + "Bool": false }, "bcs": "AA==" }, "value": { - "bcs": "AQAAAAAAAAA=", + "bcs": "AgAAAAAAAAA=", "data": { - "Number": "1" + "Number": "2" }, "__typename": "MoveValue" } @@ -208,17 +208,17 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { - "bcs": "AAAAAAAAAAA=", + "bcs": "AQAAAAAAAAA=", "data": { - "Number": "0" + "Number": "1" }, "__typename": "MoveValue" } @@ -240,17 +240,17 @@ Response: { { "name": { "type": { - "repr": "bool" + "repr": "u64" }, "data": { - "Bool": false + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { - "bcs": "AgAAAAAAAAA=", + "bcs": "AAAAAAAAAAA=", "data": { - "Number": "2" + "Number": "0" }, "__typename": "MoveValue" } diff --git a/crates/iota-graphql-e2e-tests/tests/call/simple.exp b/crates/iota-graphql-e2e-tests/tests/call/simple.exp index c87844ae5c5..4798686a2af 100644 --- a/crates/iota-graphql-e2e-tests/tests/call/simple.exp +++ b/crates/iota-graphql-e2e-tests/tests/call/simple.exp @@ -32,7 +32,7 @@ Contents: iota::coin::Coin { }, }, balance: iota::balance::Balance { - value: 300000000000000u64, + value: 30000000000000000u64, }, } @@ -77,7 +77,7 @@ Epoch advanced: 5 task 10, line 44: //# view-checkpoint -CheckpointSummary { epoch: 5, seq: 10, content_digest: CFSSaQ7k9HskTS5ZgnF5rJYTtuYzWU1HLeGbkuUyUUEA, +CheckpointSummary { epoch: 5, seq: 10, content_digest: 5FUncVVyBTNY74CQf1Y2v7SxjjMjr437Xoo2aZJkS88u, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 0, storage_cost: 0, storage_rebate: 0, non_refundable_storage_fee: 0 }} task 11, lines 46-51: @@ -155,8 +155,8 @@ Response: { "edges": [ { "node": { - "address": "0x1608877ca139c253697d715a2ed48725c186bf79bfeef411dd4e2b00c6bdea8d", - "digest": "5AwZptpuX6Zm3pVyZxAH14Ybbu12vFxYjnaUtYF5vfwu", + "address": "0x28b61d9a309c5a88a18455d588c6ba42bdcd05d7bfca44fadb2fdff0190b14b3", + "digest": "2uxZrz8XrLdjDaN5ToNn26umCL4yb5YN9AeRFAnzfvyE", "owner": { "__typename": "AddressOwner" } @@ -182,8 +182,8 @@ Response: { "edges": [ { "node": { - "address": "0x1608877ca139c253697d715a2ed48725c186bf79bfeef411dd4e2b00c6bdea8d", - "digest": "5AwZptpuX6Zm3pVyZxAH14Ybbu12vFxYjnaUtYF5vfwu", + "address": "0x28b61d9a309c5a88a18455d588c6ba42bdcd05d7bfca44fadb2fdff0190b14b3", + "digest": "2uxZrz8XrLdjDaN5ToNn26umCL4yb5YN9AeRFAnzfvyE", "owner": { "__typename": "AddressOwner" } @@ -198,7 +198,7 @@ Response: { { "node": { "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2", - "digest": "CFPygJWykX4VR2XRumroR1xzqRkWvuw84t8oVbXKojxE", + "digest": "2sYWKex6yu3k1CXMYwnLkqYKhnGmnP3yP1dJLhR5Xkko", "owner": { "__typename": "AddressOwner" } @@ -206,8 +206,8 @@ Response: { }, { "node": { - "address": "0x2d73996ed4c45622576a3a1f8d510e463b5bc19b794a38abdd97ff04fc0cfe0f", - "digest": "BFKQyKRDWRdRMgFLTvdPPFdpxF9LR77cXPxMaSZvJU2F", + "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31", + "digest": "9UKK4yuneF6FvxgtNXLcb3fmaVKnwwEibPXRYaQRHRzj", "owner": { "__typename": "AddressOwner" } @@ -215,8 +215,8 @@ Response: { }, { "node": { - "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31", - "digest": "7THNyvHPZ2X1VisrJpLPCRU62Jnh5CQKcCWSkYBqZHNh", + "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461", + "digest": "Be8LdYznQGaiKJ1Zcp9nH4pKtUYRaXQVtq8kj9NZrHjJ", "owner": { "__typename": "AddressOwner" } @@ -224,8 +224,8 @@ Response: { }, { "node": { - "address": "0x39b3212d7ca502b68569273131de76e469e2393d029166a4395f11e668219d51", - "digest": "DJcz2aAa9Cszp9C1EyEhyQq8GngHDgLFiy2ALR4KwomK", + "address": "0x48c6a3b6b09076c9d9da63411aadfb10327fc8d2e7223dbf12fe843588b202df", + "digest": "9DTNHygGtUHtpx2FLoF5gD2i1pMqqMyB63ima322HnYc", "owner": { "__typename": "AddressOwner" } @@ -233,8 +233,8 @@ Response: { }, { "node": { - "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461", - "digest": "GTdAWvcxoVdYULpeNreA5k8qtkqdyvbQtLv4ZyMdrXKp", + "address": "0x57cb8e1780b3c414a13397213f69198e6eb6f269333431ba7f16d7baeb79c25d", + "digest": "2CDCVccBAm9xntXxNZY8PYsuLrNCRwzBv5srUwsGziFZ", "owner": { "__typename": "AddressOwner" } @@ -242,8 +242,8 @@ Response: { }, { "node": { - "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97", - "digest": "BURkA1yytqusJFxoNzmdmgrmTjCANNSD3NXyMdT889qD", + "address": "0x823dd2709d95ec2034c4892191d8b3418487a75abdddd054679b994746561959", + "digest": "5EGBgWa2meW9wqH6wxprz9awzt4kGra4EhR6FW2vvsq6", "owner": { "__typename": "AddressOwner" } @@ -251,8 +251,8 @@ Response: { }, { "node": { - "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056", - "digest": "4H9Couizps4bSeBeYT8eozPhDfr4qHS6SFHpE2Q1Vsa8", + "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97", + "digest": "3QSgX14R65FBTub7d1dwnExPhFNSSNrMS1FEfSQpRJR7", "owner": { "__typename": "AddressOwner" } @@ -260,8 +260,8 @@ Response: { }, { "node": { - "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d", - "digest": "mJu6zTakUAde6ogJ3kRTebpbMSRdsVKjL1FYXN4tu6A", + "address": "0x88cf6147a9c57ab642cd71d22c2e91577db6bf93d26e30dc55046e61da855253", + "digest": "EXBNoySgRY88bqZz5X6dy41gsrHtHKobdFDaX2s7SZ5x", "owner": { "__typename": "AddressOwner" } @@ -269,8 +269,8 @@ Response: { }, { "node": { - "address": "0xb1dfd4591d07028099000e2fe4c4afac8223b047cbd6b36431157ff45a125ff0", - "digest": "DQxanZq1c5C2anLFnKHohshUzMX9q7PoVMHbihePTooa", + "address": "0x8cf840979473dc5fa9305e37aa467afaca8cac1fc403715eaa1a281a11a3807d", + "digest": "13Egdk3JXG33jF26eKG1Es2dsEhX2g6yG7ZNdK3effAU", "owner": { "__typename": "AddressOwner" } @@ -278,8 +278,8 @@ Response: { }, { "node": { - "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8", - "digest": "Cw9TrzJPNrNr9VJ5jWPtpKJGKvwDjb6ba8dRr2UQia7H", + "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056", + "digest": "nPWD3aqbQmz7e5voUkHzMQ7pi3NhHh7erKzTKPLffhh", "owner": { "__typename": "AddressOwner" } @@ -287,8 +287,8 @@ Response: { }, { "node": { - "address": "0xc92850f727ad46e12d23b68348c4a45f1aecc9c7e3128998366ff5614d735ceb", - "digest": "DQuEwsS3pZiLp6hwh4nuJMbwxborFLRinR1ZGyeYNsqb", + "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d", + "digest": "3zHhWmCGNWM9hYZ41PL7fUksLudgoFDexFeaC53uut3q", "owner": { "__typename": "AddressOwner" } @@ -296,8 +296,8 @@ Response: { }, { "node": { - "address": "0xcdca10a91f667fe1511062c5db4de41b2694819d4bd0139310c7bc07b40ceb87", - "digest": "A2f7QTL5EpT4eNbp779UWNiw1aKrvjst7epVgoonMSd9", + "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8", + "digest": "8DWBQ73PBVbKXvWpD6BCG1vgHMbc4XS2Ra3hgzJAz5N9", "owner": { "__typename": "AddressOwner" } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp index 9d0decda850..74cfe4fc5be 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp @@ -80,7 +80,7 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "700" @@ -103,7 +103,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "400" + "totalBalance": "500" }, "allBalances": { "nodes": [ @@ -116,10 +116,10 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 2, - "totalBalance": "400" + "totalBalance": "500" } ] } @@ -139,7 +139,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "300" + "totalBalance": "400" }, "allBalances": { "nodes": [ @@ -152,10 +152,10 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 1, - "totalBalance": "300" + "totalBalance": "400" } ] } @@ -196,7 +196,7 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "700" @@ -219,7 +219,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "400" + "totalBalance": "500" }, "allBalances": { "nodes": [ @@ -232,10 +232,10 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 2, - "totalBalance": "400" + "totalBalance": "500" } ] } @@ -255,7 +255,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "300" + "totalBalance": "400" }, "allBalances": { "nodes": [ @@ -268,10 +268,10 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 1, - "totalBalance": "300" + "totalBalance": "400" } ] } @@ -334,7 +334,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "400" + "totalBalance": "500" }, "allBalances": { "nodes": [ @@ -347,10 +347,10 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 2, - "totalBalance": "400" + "totalBalance": "500" } ] } @@ -370,7 +370,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "300" + "totalBalance": "400" }, "allBalances": { "nodes": [ @@ -383,10 +383,10 @@ Response: { }, { "coinType": { - "repr": "0xb340704a6b41d161cde30f35153f0cd605f1ce10213062e6e2979679c1da9f01::fake::FAKE" + "repr": "0x376311344c7fc9db153ee6a27ed1e855d1d427d9227ea9582f36f6a85a472621::fake::FAKE" }, "coinObjectCount": 1, - "totalBalance": "300" + "totalBalance": "400" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp index 3dfdc9412de..5f73018ed74 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp @@ -94,12 +94,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU", + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -109,12 +109,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "J7gXZTXkH2A2Q5YfmBXqrSszGrPC17LjcjzcpGhs5VFh", + "digest": "GYWosM2BJaJK6K1bAyAzEGLhEVXzQaP3CKgRpb3MJJCM", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -124,12 +124,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "9BWpbEeK1ti6kr8byL9RaSPpxqdYS9BVYvs391e3BReZ", + "digest": "D6x1kDu7GkY4GVPBpnM2s3MXwJt3DeoKAHMfSgBNvLpB", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -139,12 +139,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT", + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -161,12 +161,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "G3HAB2s6Nbpt4UkxifXQbnM7Xw2UAFiyzZTEc4XznUyx", + "digest": "4FVMQcFWT7gS2sF8xkXa83SP2NBWQW8QkGSn7WENWScv", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -176,12 +176,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "AfGFGv7NQ2dnJybrkZyueHGffm6dtDf53drJDTQ35QHj", + "digest": "CMquL9ZpHdvR786ZdBQY8Jc4RzgPsaY9p18jPwqPNWyb", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -191,12 +191,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "9GASeNsMNUdoXoZYaCQM93gNfwLA3oXFWq7SEGLjmVRf", + "digest": "9Z3KC269nkjziG87HMVdixCsnmBMo2mjQJSka3C3k7c5", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -213,12 +213,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "8tLdofXnCLz4vDDzKTYmX2oWe38G1HEtgLp6A7q2ATg6", + "digest": "BdERYg4auXdBGME3VB4FEFeGXUrzMZrKN5BWEWgAr7PW", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } @@ -228,12 +228,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "6UsD147qhoUQKoJ2kebmHE1GZEKDbbGCHiMiBhhzSAzR", + "digest": "AP3DYsk4iVFwjCfT8qMZFoSiTXj7me8536n7hc5fJ7u1", "sender": { "objects": { "edges": [ { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLAwAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZAwAAAAAAAAA=" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp index cc61f42fe8f..c539bbd4316 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp @@ -33,7 +33,7 @@ Response: { "queryCoinsAtLatest": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAgAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -41,37 +41,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAgAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAgAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAgAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -85,16 +85,16 @@ Response: { }, "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAgAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -102,37 +102,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAgAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAgAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAgAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -146,16 +146,16 @@ Response: { }, "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAgAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -163,37 +163,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAgAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAgAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAgAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -207,7 +207,7 @@ Response: { }, "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -221,37 +221,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAgAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAgAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAgAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -272,7 +272,7 @@ Response: { "queryCoinsAtChkpt1": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -280,37 +280,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAQAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -324,16 +324,16 @@ Response: { }, "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -341,37 +341,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAQAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -385,9 +385,9 @@ Response: { }, "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } @@ -399,26 +399,26 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } @@ -453,7 +453,7 @@ Response: { "queryCoins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAwAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -461,13 +461,13 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAwAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } @@ -479,16 +479,16 @@ Response: { }, "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAwAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -496,24 +496,24 @@ Response: { "coins": { "edges": [ { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAwAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAwAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -527,16 +527,16 @@ Response: { }, "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAwAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -544,24 +544,24 @@ Response: { "coins": { "edges": [ { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAwAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAwAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -575,7 +575,7 @@ Response: { }, "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -589,13 +589,13 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAwAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "100200" + "value": "100300" } } } @@ -608,24 +608,24 @@ Response: { "coins": { "edges": [ { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAwAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAwAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -658,7 +658,7 @@ Response: { "queryCoinsAtChkpt1BeforeSnapshotCatchup": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -666,37 +666,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAQAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -710,16 +710,16 @@ Response: { }, "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -727,37 +727,37 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } } }, { - "cursor": "ILvmVGP3Hmg3QwQ7PwoHco4cP/RjHm38LLGsiEihLyxaAQAAAAAAAAA=", + "cursor": "ILMO1u/Lei37MPuDSH3bAhdzmjKYXJ9luZkEdslc7FtDAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xbbe65463f71e683743043b3f0a07728e1c3ff4631e6dfc2cb1ac8848a12f2c5a", + "id": "0xb30ed6efcb7a2dfb30fb83487ddb0217739a32985c9f65b9990476c95cec5b43", "balance": { "value": "100" } @@ -771,9 +771,9 @@ Response: { }, "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } @@ -785,26 +785,26 @@ Response: { "coins": { "edges": [ { - "cursor": "IFX99Jrta8GL9ir5z6Asr1HOTGNb9lhaOM291xu/el5JAQAAAAAAAAA=", + "cursor": "IEDu+CoxLaCVSxLN+T6CUwmMcQX373HtYan0THbCP57+AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x55fdf49aed6bc18bf62af9cfa02caf51ce4c635bf6585a38cdbdd71bbf7a5e49", + "id": "0x40eef82a312da0954b12cdf93e8253098c7105f7ef71ed61a9f44c76c23f9efe", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IGDoIzrBh5Wudol8Kx8f2FoV7B/94M7hFWfsh5eO1w+RAQAAAAAAAAA=", + "cursor": "IEKQb1DS2D7eqPLrgXMwwbNHWv2XK2I4Kf4Yo4/H7xpkAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x60e8233ac18795ae76897c2b1f1fd85a15ec1ffde0cee11567ec87978ed70f91", + "id": "0x42906f50d2d83edea8f2eb817330c1b3475afd972b623829fe18a38fc7ef1a64", "balance": { - "value": "300" + "value": "200" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp index 58a213bef2c..5e8b2d84624 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp @@ -90,35 +90,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IIrnxAoZunee91E+hADKZb2PrG9e+sHetxfXfe8emgXpAQAAAAAAAAA=", + "cursor": "IJGaeCFEaPmSCjgVkOfvELmmAtB3Z928iSS0rfX5jTb8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "INbtwx6T51Snp79Fl2Ca4MFOXlxAEJ9EpMON6ehkNfiGAQAAAAAAAAA=", + "cursor": "INgBUxenvEWVxRDnSw9tRPaAImHVSlOP9vgsq6IQMHfVAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNA==" }, "value": { - "json": "df5" + "json": "df4" } } }, { - "cursor": "IPppfz8xQsj+pPDkm1tQ0TBf6KjBUq3o2UY+bw9PFyCUAQAAAAAAAAA=", + "cursor": "IOnid5E/2xvqQ4ZYWO0VRetuyK5VW+0nL7O55bDUNKdNAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df6" + "json": "df5" } } } @@ -139,35 +139,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IIrnxAoZunee91E+hADKZb2PrG9e+sHetxfXfe8emgXpAQAAAAAAAAA=", + "cursor": "IJGaeCFEaPmSCjgVkOfvELmmAtB3Z928iSS0rfX5jTb8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "INbtwx6T51Snp79Fl2Ca4MFOXlxAEJ9EpMON6ehkNfiGAQAAAAAAAAA=", + "cursor": "INgBUxenvEWVxRDnSw9tRPaAImHVSlOP9vgsq6IQMHfVAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNA==" }, "value": { - "json": "df5" + "json": "df4" } } }, { - "cursor": "IPppfz8xQsj+pPDkm1tQ0TBf6KjBUq3o2UY+bw9PFyCUAQAAAAAAAAA=", + "cursor": "IOnid5E/2xvqQ4ZYWO0VRetuyK5VW+0nL7O55bDUNKdNAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df6" + "json": "df5" } } } @@ -188,51 +188,51 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IALdRHIrx84R+fG1yr1Wxc16OBvz0RmMa3wy7ctbBgQnAQAAAAAAAAA=", + "cursor": "IC726d4+ur6D7buQahUHqhGHuzzqtPpLASK3JXsU+ODFAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmMQ==" }, "value": { - "json": "df2" + "json": "df1" } } }, { - "cursor": "IIrnxAoZunee91E+hADKZb2PrG9e+sHetxfXfe8emgXpAQAAAAAAAAA=", + "cursor": "IJGaeCFEaPmSCjgVkOfvELmmAtB3Z928iSS0rfX5jTb8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "IJ1G/BGDEFw461FCSmlouwqKQIXNHGgTjH8znbEggOfCAQAAAAAAAAA=", + "cursor": "IMHR3c7mtZLbzbX0BTQ50TPTW3lPOZxPtNpbTap+RT+wAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==" + "bcs": "A2RmMg==" }, "value": { - "json": "df3" + "json": "df2" } } }, { - "cursor": "INS8tcKUJUWNfUBrd4BNMFol18/uT3ljmzVo58Neao12AQAAAAAAAAA=", + "cursor": "INgBUxenvEWVxRDnSw9tRPaAImHVSlOP9vgsq6IQMHfVAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==" + "bcs": "A2RmNA==" }, "value": { - "json": "df1" + "json": "df4" } } }, { - "cursor": "INbtwx6T51Snp79Fl2Ca4MFOXlxAEJ9EpMON6ehkNfiGAQAAAAAAAAA=", + "cursor": "IOnid5E/2xvqQ4ZYWO0VRetuyK5VW+0nL7O55bDUNKdNAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNQ==" @@ -243,13 +243,13 @@ Response: { } }, { - "cursor": "IPppfz8xQsj+pPDkm1tQ0TBf6KjBUq3o2UY+bw9PFyCUAQAAAAAAAAA=", + "cursor": "IPqnY4s6fSErsHNvrFwhf6T/9xw9+7dn1a7S90Ss5V1iAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmMw==" }, "value": { - "json": "df6" + "json": "df3" } } } @@ -283,35 +283,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IIrnxAoZunee91E+hADKZb2PrG9e+sHetxfXfe8emgXpAQAAAAAAAAA=", + "cursor": "IJGaeCFEaPmSCjgVkOfvELmmAtB3Z928iSS0rfX5jTb8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "INbtwx6T51Snp79Fl2Ca4MFOXlxAEJ9EpMON6ehkNfiGAQAAAAAAAAA=", + "cursor": "INgBUxenvEWVxRDnSw9tRPaAImHVSlOP9vgsq6IQMHfVAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNA==" }, "value": { - "json": "df5" + "json": "df4" } } }, { - "cursor": "IPppfz8xQsj+pPDkm1tQ0TBf6KjBUq3o2UY+bw9PFyCUAQAAAAAAAAA=", + "cursor": "IOnid5E/2xvqQ4ZYWO0VRetuyK5VW+0nL7O55bDUNKdNAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df6" + "json": "df5" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp index 5a458910995..2a7aef970f6 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp @@ -41,7 +41,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDCP7DnOo1FByWDLaYE0hUFTHrstk7awHi4oeUpXDDOwAQAAAAAAAAA=", + "cursor": "IKnXcW431N4bwLTgpPlpJut0bqemO+LAPj62UYMYu2n+AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -49,7 +49,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x442a81a90ef3cc4e6219de967459bd9a0808f7204119f5da0795713f128be6ce", + "id": "0x81fecf8ec0fbeb91b7bd13d904c3558534bbee584134d75f8c9b4b841d759fd0", "count": "0" } } @@ -65,7 +65,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x442a81a90ef3cc4e6219de967459bd9a0808f7204119f5da0795713f128be6ce", + "id": "0x81fecf8ec0fbeb91b7bd13d904c3558534bbee584134d75f8c9b4b841d759fd0", "count": "0" } } @@ -77,7 +77,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDCP7DnOo1FByWDLaYE0hUFTHrstk7awHi4oeUpXDDOwAQAAAAAAAAA=", + "cursor": "IKnXcW431N4bwLTgpPlpJut0bqemO+LAPj62UYMYu2n+AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x442a81a90ef3cc4e6219de967459bd9a0808f7204119f5da0795713f128be6ce", + "id": "0x81fecf8ec0fbeb91b7bd13d904c3558534bbee584134d75f8c9b4b841d759fd0", "count": "0" } } @@ -101,7 +101,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x442a81a90ef3cc4e6219de967459bd9a0808f7204119f5da0795713f128be6ce", + "id": "0x81fecf8ec0fbeb91b7bd13d904c3558534bbee584134d75f8c9b4b841d759fd0", "count": "0" } } @@ -117,7 +117,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x442a81a90ef3cc4e6219de967459bd9a0808f7204119f5da0795713f128be6ce", + "id": "0x81fecf8ec0fbeb91b7bd13d904c3558534bbee584134d75f8c9b4b841d759fd0", "count": "0" } } @@ -168,7 +168,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x442a81a90ef3cc4e6219de967459bd9a0808f7204119f5da0795713f128be6ce", + "id": "0x81fecf8ec0fbeb91b7bd13d904c3558534bbee584134d75f8c9b4b841d759fd0", "count": "0" } } @@ -222,7 +222,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x442a81a90ef3cc4e6219de967459bd9a0808f7204119f5da0795713f128be6ce", + "id": "0x81fecf8ec0fbeb91b7bd13d904c3558534bbee584134d75f8c9b4b841d759fd0", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp index c372901ca5c..d88a1d2531d 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp @@ -36,7 +36,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IG4TzVv91AjTjxZ1ZExL33X/Szr8jk4PjnwO5ls8iL/qAQAAAAAAAAA=", + "cursor": "IKEn1WHgDkAjUJKjQ3vdw/vTNabXA+LEKML9ovw6+RnEAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -44,7 +44,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xb96705ece861e953439e1945f0b7bb0b437b229bb0fa645cbec66ce27d84f2f2", + "id": "0xb577808b3d76eb57e8d20f973b34f3f84a02d011b63dfafdf4123e373fab60cd", "count": "0" } } @@ -60,7 +60,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xb96705ece861e953439e1945f0b7bb0b437b229bb0fa645cbec66ce27d84f2f2", + "id": "0xb577808b3d76eb57e8d20f973b34f3f84a02d011b63dfafdf4123e373fab60cd", "count": "0" } } @@ -71,7 +71,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IG4TzVv91AjTjxZ1ZExL33X/Szr8jk4PjnwO5ls8iL/qAQAAAAAAAAA=", + "cursor": "IKEn1WHgDkAjUJKjQ3vdw/vTNabXA+LEKML9ovw6+RnEAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -79,7 +79,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xb96705ece861e953439e1945f0b7bb0b437b229bb0fa645cbec66ce27d84f2f2", + "id": "0xb577808b3d76eb57e8d20f973b34f3f84a02d011b63dfafdf4123e373fab60cd", "count": "0" } } @@ -95,7 +95,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xb96705ece861e953439e1945f0b7bb0b437b229bb0fa645cbec66ce27d84f2f2", + "id": "0xb577808b3d76eb57e8d20f973b34f3f84a02d011b63dfafdf4123e373fab60cd", "count": "0" } } @@ -107,7 +107,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IG4TzVv91AjTjxZ1ZExL33X/Szr8jk4PjnwO5ls8iL/qAQAAAAAAAAA=", + "cursor": "IKEn1WHgDkAjUJKjQ3vdw/vTNabXA+LEKML9ovw6+RnEAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -115,7 +115,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xb96705ece861e953439e1945f0b7bb0b437b229bb0fa645cbec66ce27d84f2f2", + "id": "0xb577808b3d76eb57e8d20f973b34f3f84a02d011b63dfafdf4123e373fab60cd", "count": "0" } } @@ -131,7 +131,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xb96705ece861e953439e1945f0b7bb0b437b229bb0fa645cbec66ce27d84f2f2", + "id": "0xb577808b3d76eb57e8d20f973b34f3f84a02d011b63dfafdf4123e373fab60cd", "count": "0" } } @@ -184,7 +184,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xb96705ece861e953439e1945f0b7bb0b437b229bb0fa645cbec66ce27d84f2f2", + "id": "0xb577808b3d76eb57e8d20f973b34f3f84a02d011b63dfafdf4123e373fab60cd", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp index 2922663060f..42a0eb8b8cd 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp @@ -61,7 +61,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IC3gEyH/BdwzIykCH3lF23k18FvvmhxJtHAfZWp5tccTAQAAAAAAAAA=", + "cursor": "IMB4YqqwC75gEaLtIfYvtdj0CqcZlU/N1QtmcKtbY1DcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -69,7 +69,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } @@ -96,7 +96,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IC3gEyH/BdwzIykCH3lF23k18FvvmhxJtHAfZWp5tccTAQAAAAAAAAA=", + "cursor": "IMB4YqqwC75gEaLtIfYvtdj0CqcZlU/N1QtmcKtbY1DcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -104,7 +104,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } @@ -120,7 +120,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } @@ -139,7 +139,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IC3gEyH/BdwzIykCH3lF23k18FvvmhxJtHAfZWp5tccTAQAAAAAAAAA=", + "cursor": "IMB4YqqwC75gEaLtIfYvtdj0CqcZlU/N1QtmcKtbY1DcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -147,7 +147,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } @@ -163,7 +163,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } @@ -182,7 +182,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IC3gEyH/BdwzIykCH3lF23k18FvvmhxJtHAfZWp5tccTAQAAAAAAAAA=", + "cursor": "IMB4YqqwC75gEaLtIfYvtdj0CqcZlU/N1QtmcKtbY1DcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -190,7 +190,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } @@ -206,7 +206,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xacea050b2761173d591ce5382d54a6d0f33eb91aefe6419557b902ae43647a55", + "id": "0xe0550d8c05abf08b089787d5f39a2ce96ab807584e0211906a04319a415200ef", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp index e29f3f75b70..3f528463188 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp @@ -84,7 +84,7 @@ task 9, lines 103-165: Response: { "data": { "parent_version_2_no_dof": { - "address": "0x2ee5f1e3d3e81b8a0fcd97260e8f20ec716389baf779238e505ee2c839eee97a", + "address": "0x2566e53b14bbe62dad4be42bb91b086ceb6af82b4ee251a399ab7602e835f060", "dynamicFields": { "edges": [] } @@ -93,7 +93,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzAQAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtAQAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -104,7 +104,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "1" } } @@ -115,13 +115,13 @@ Response: { } }, "child_version_2_no_parent": { - "address": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "address": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "owner": {} }, "child_version_3_has_parent": { "owner": { "parent": { - "address": "0x96dbc5cd9afff30fc5f330df493f0b631657b6ef31ffde3157834bb4d231d5b3" + "address": "0xa9c100da0c6c2ab2627e430621708ff4f318558b569cdd3baa6c940fb97145ad" } } } @@ -173,40 +173,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDNAem/wkdzeMz6Nwjq2PDJrMuyqqeGaIphh8J2JYdocAgAAAAAAAAA=", + "cursor": "IGyk/9c+1uPqW+mzioa1OyxIBhJNlZ8EEKEfN9YN3YNCAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } }, { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzAgAAAAAAAAA=", + "cursor": "IJA/AxFvFneLRjpPM7cuDeoNNzWRmqBgR5wMSKQQb5/hAgAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMQ==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", - "count": "2" - } - } + "json": "df1" } } }, { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9AgAAAAAAAAA=", + "cursor": "IJQmzzpGLYpTe04Xi7GWzvMCxDFZmQc4goc9xtOFuy7mAgAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMg==", @@ -220,16 +215,21 @@ Response: { } }, { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lAgAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df3" + "contents": { + "json": { + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", + "count": "2" + } + } } } } @@ -240,7 +240,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzAgAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtAgAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -251,7 +251,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "1" } } @@ -268,36 +268,7 @@ Response: { }, "use_dof_version_4_cursor_at_parent_version_4": { "dynamicFields": { - "edges": [ - { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9AgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMw==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df3" - } - } - } - ] + "edges": [] } }, "use_dof_version_3_cursor_at_parent_version_3": { @@ -328,7 +299,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "1" } } @@ -347,7 +318,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "2" } } @@ -412,40 +383,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDNAem/wkdzeMz6Nwjq2PDJrMuyqqeGaIphh8J2JYdocAwAAAAAAAAA=", + "cursor": "IGyk/9c+1uPqW+mzioa1OyxIBhJNlZ8EEKEfN9YN3YNCAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } }, { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzAwAAAAAAAAA=", + "cursor": "IJA/AxFvFneLRjpPM7cuDeoNNzWRmqBgR5wMSKQQb5/hAwAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMQ==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", - "count": "2" - } - } + "json": "df1" } } }, { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9AwAAAAAAAAA=", + "cursor": "IJQmzzpGLYpTe04Xi7GWzvMCxDFZmQc4goc9xtOFuy7mAwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMg==", @@ -459,16 +425,21 @@ Response: { } }, { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lAwAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df3" + "contents": { + "json": { + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", + "count": "2" + } + } } } } @@ -476,72 +447,71 @@ Response: { } }, "parent_version_4_paginated_on_dof_consistent": { + "dynamicFields": { + "edges": [] + } + }, + "parent_version_5_has_7_children": { "dynamicFields": { "edges": [ { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9AgAAAAAAAAA=", + "cursor": "IGyk/9c+1uPqW+mzioa1OyxIBhJNlZ8EEKEfN9YN3YNCAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df2" + "json": "df3" } } }, { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lAgAAAAAAAAA=", + "cursor": "IHWnXe5TyH3x+Vy0nEP1riY/8BanDuMCjkTmJBPn0Wr+AwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df5" } } - } - ] - } - }, - "parent_version_5_has_7_children": { - "dynamicFields": { - "edges": [ + }, { - "cursor": "IBdQmQXltOGJ5loOWtr4HXBAs4FwB9jLmlc/59VoO4XgAwAAAAAAAAA=", + "cursor": "IJA/AxFvFneLRjpPM7cuDeoNNzWRmqBgR5wMSKQQb5/hAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmMQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df1" } } }, { - "cursor": "IDNAem/wkdzeMz6Nwjq2PDJrMuyqqeGaIphh8J2JYdocAwAAAAAAAAA=", + "cursor": "IJQmzzpGLYpTe04Xi7GWzvMCxDFZmQc4goc9xtOFuy7mAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMg==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df2" } } }, { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzAwAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtAwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -552,7 +522,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "2" } } @@ -560,35 +530,7 @@ Response: { } }, { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9AwAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lAwAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMw==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df3" - } - } - }, - { - "cursor": "IMjXlRKjxj1MJVaDQYRaKctWr/k6i4D0rw2JyWU48o8rAwAAAAAAAAA=", + "cursor": "IMugy76ycay2pxbz6aZwliBJ7ghOR0dKxRkP2HmTguGEAwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -602,16 +544,16 @@ Response: { } }, { - "cursor": "IPI8omSF8lEgVmZY1Ud2vxhIs0MdYQjaiUbEzR73ShN1AwAAAAAAAAA=", + "cursor": "IOafOdIqt99DP8izBZ0vYSbGG+lZ2eBDvkhx2O+L2YtHAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -622,35 +564,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9AwAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lAwAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMw==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df3" - } - } - }, - { - "cursor": "IMjXlRKjxj1MJVaDQYRaKctWr/k6i4D0rw2JyWU48o8rAwAAAAAAAAA=", + "cursor": "IMugy76ycay2pxbz6aZwliBJ7ghOR0dKxRkP2HmTguGEAwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -664,16 +578,16 @@ Response: { } }, { - "cursor": "IPI8omSF8lEgVmZY1Ud2vxhIs0MdYQjaiUbEzR73ShN1AwAAAAAAAAA=", + "cursor": "IOafOdIqt99DP8izBZ0vYSbGG+lZ2eBDvkhx2O+L2YtHAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -727,40 +641,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDNAem/wkdzeMz6Nwjq2PDJrMuyqqeGaIphh8J2JYdocBAAAAAAAAAA=", + "cursor": "IGyk/9c+1uPqW+mzioa1OyxIBhJNlZ8EEKEfN9YN3YNCBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } }, { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzBAAAAAAAAAA=", + "cursor": "IJA/AxFvFneLRjpPM7cuDeoNNzWRmqBgR5wMSKQQb5/hBAAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMQ==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", - "count": "2" - } - } + "json": "df1" } } }, { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9BAAAAAAAAAA=", + "cursor": "IJQmzzpGLYpTe04Xi7GWzvMCxDFZmQc4goc9xtOFuy7mBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMg==", @@ -774,16 +683,21 @@ Response: { } }, { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lBAAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df3" + "contents": { + "json": { + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", + "count": "2" + } + } } } } @@ -792,57 +706,28 @@ Response: { }, "parent_version_4_paginated_on_dof_consistent": { "dynamicFields": { - "edges": [ - { - "cursor": "IKZNJNMbvE0/xZb9FSbRHIq2iaBBW1BxctIQGGBABBW9AgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "IMdlWabBeFMkjyk29O7R/AgcPvisIZUifB2MVY5diT2lAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMw==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df3" - } - } - } - ] + "edges": [] } }, "parent_version_6_no_df_1_2_3": { "dynamicFields": { "edges": [ { - "cursor": "IBdQmQXltOGJ5loOWtr4HXBAs4FwB9jLmlc/59VoO4XgBAAAAAAAAAA=", + "cursor": "IHWnXe5TyH3x+Vy0nEP1riY/8BanDuMCjkTmJBPn0Wr+BAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df5" } } }, { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzBAAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtBAAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -853,7 +738,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "2" } } @@ -861,7 +746,7 @@ Response: { } }, { - "cursor": "IMjXlRKjxj1MJVaDQYRaKctWr/k6i4D0rw2JyWU48o8rBAAAAAAAAAA=", + "cursor": "IMugy76ycay2pxbz6aZwliBJ7ghOR0dKxRkP2HmTguGEBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -875,16 +760,16 @@ Response: { } }, { - "cursor": "IPI8omSF8lEgVmZY1Ud2vxhIs0MdYQjaiUbEzR73ShN1BAAAAAAAAAA=", + "cursor": "IOafOdIqt99DP8izBZ0vYSbGG+lZ2eBDvkhx2O+L2YtHBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -895,7 +780,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IMjXlRKjxj1MJVaDQYRaKctWr/k6i4D0rw2JyWU48o8rBAAAAAAAAAA=", + "cursor": "IMugy76ycay2pxbz6aZwliBJ7ghOR0dKxRkP2HmTguGEBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -909,16 +794,16 @@ Response: { } }, { - "cursor": "IPI8omSF8lEgVmZY1Ud2vxhIs0MdYQjaiUbEzR73ShN1BAAAAAAAAAA=", + "cursor": "IOafOdIqt99DP8izBZ0vYSbGG+lZ2eBDvkhx2O+L2YtHBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -975,7 +860,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzBwAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtBwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -986,7 +871,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "2" } } @@ -1001,21 +886,21 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IBdQmQXltOGJ5loOWtr4HXBAs4FwB9jLmlc/59VoO4XgBwAAAAAAAAA=", + "cursor": "IHWnXe5TyH3x+Vy0nEP1riY/8BanDuMCjkTmJBPn0Wr+BwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df5" } } }, { - "cursor": "IJbbxc2a//MPxfMw30k/C2MWV7bvMf/eMVeDS7TSMdWzBwAAAAAAAAA=", + "cursor": "IKnBANoMbCqyYn5DBiFwj/TzGFWLVpzdO6pslA+5cUWtBwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -1026,7 +911,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xe803a132549bdb868563ed75a11597fb09b1b60dd72d4db6bcce0070fabff30f", + "id": "0xf391fd83df7f13a89d0632039906b6c589ead707848c68f03bf73a2598bd905e", "count": "2" } } @@ -1034,7 +919,7 @@ Response: { } }, { - "cursor": "IMjXlRKjxj1MJVaDQYRaKctWr/k6i4D0rw2JyWU48o8rBwAAAAAAAAA=", + "cursor": "IMugy76ycay2pxbz6aZwliBJ7ghOR0dKxRkP2HmTguGEBwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -1048,16 +933,16 @@ Response: { } }, { - "cursor": "IPI8omSF8lEgVmZY1Ud2vxhIs0MdYQjaiUbEzR73ShN1BwAAAAAAAAA=", + "cursor": "IOafOdIqt99DP8izBZ0vYSbGG+lZ2eBDvkhx2O+L2YtHBwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -1068,7 +953,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IMjXlRKjxj1MJVaDQYRaKctWr/k6i4D0rw2JyWU48o8rBAAAAAAAAAA=", + "cursor": "IMugy76ycay2pxbz6aZwliBJ7ghOR0dKxRkP2HmTguGEBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -1082,16 +967,16 @@ Response: { } }, { - "cursor": "IPI8omSF8lEgVmZY1Ud2vxhIs0MdYQjaiUbEzR73ShN1BAAAAAAAAAA=", + "cursor": "IOafOdIqt99DP8izBZ0vYSbGG+lZ2eBDvkhx2O+L2YtHBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp index bec1ee315f6..30d8a425c29 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp @@ -58,11 +58,11 @@ Response: { "nodes": [ { "value": { - "address": "0x7da4ebae7df1748d5dd0287f78b20ee0c27363602d4e27861a1a4543c415d1c8", + "address": "0x8558226e7ca2829bd5bbae27688f5f0786b4fb8f94c22e346927189aa1e82dce", "version": 5, "contents": { "json": { - "id": "0x7da4ebae7df1748d5dd0287f78b20ee0c27363602d4e27861a1a4543c415d1c8", + "id": "0x8558226e7ca2829bd5bbae27688f5f0786b4fb8f94c22e346927189aa1e82dce", "count": "0" } }, @@ -86,11 +86,11 @@ Response: { "nodes": [ { "value": { - "address": "0x7da4ebae7df1748d5dd0287f78b20ee0c27363602d4e27861a1a4543c415d1c8", + "address": "0x8558226e7ca2829bd5bbae27688f5f0786b4fb8f94c22e346927189aa1e82dce", "version": 5, "contents": { "json": { - "id": "0x7da4ebae7df1748d5dd0287f78b20ee0c27363602d4e27861a1a4543c415d1c8", + "id": "0x8558226e7ca2829bd5bbae27688f5f0786b4fb8f94c22e346927189aa1e82dce", "count": "0" } }, @@ -98,11 +98,11 @@ Response: { "nodes": [ { "value": { - "address": "0xa00f250bd958d87ccd2d84856ba4fe419ada9207f0777671bbb3a0dd50a4a2bd", + "address": "0x232a28ed644c3ee4c665caee234f83f330520bbc1d41e45165b5778b84735e1a", "version": 6, "contents": { "json": { - "id": "0xa00f250bd958d87ccd2d84856ba4fe419ada9207f0777671bbb3a0dd50a4a2bd", + "id": "0x232a28ed644c3ee4c665caee234f83f330520bbc1d41e45165b5778b84735e1a", "count": "0" } } @@ -145,7 +145,7 @@ Response: { "object": { "owner": { "parent": { - "address": "0x6366edebadc095a3bd5a17a36e1b8c3531ebfbd444bd179fc6dd94667ad9dd65" + "address": "0x2ea7552a4de848cf351a4a00a8c2853c8182e9bdbd0f5e9b74d526a39ec5fa6f" } }, "dynamicFields": { @@ -175,11 +175,11 @@ Response: { "nodes": [ { "value": { - "address": "0xa00f250bd958d87ccd2d84856ba4fe419ada9207f0777671bbb3a0dd50a4a2bd", + "address": "0x232a28ed644c3ee4c665caee234f83f330520bbc1d41e45165b5778b84735e1a", "version": 6, "contents": { "json": { - "id": "0xa00f250bd958d87ccd2d84856ba4fe419ada9207f0777671bbb3a0dd50a4a2bd", + "id": "0x232a28ed644c3ee4c665caee234f83f330520bbc1d41e45165b5778b84735e1a", "count": "0" } } @@ -203,11 +203,11 @@ Response: { "nodes": [ { "value": { - "address": "0xa00f250bd958d87ccd2d84856ba4fe419ada9207f0777671bbb3a0dd50a4a2bd", + "address": "0x232a28ed644c3ee4c665caee234f83f330520bbc1d41e45165b5778b84735e1a", "version": 6, "contents": { "json": { - "id": "0xa00f250bd958d87ccd2d84856ba4fe419ada9207f0777671bbb3a0dd50a4a2bd", + "id": "0x232a28ed644c3ee4c665caee234f83f330520bbc1d41e45165b5778b84735e1a", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp index e26e3cfa016..076c3e14c11 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp @@ -78,7 +78,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "ICX2vpajAlJ8NJOOAOxRREhN1+jQRI0zPn1nZF+rpwKxAQAAAAAAAAA=", + "cursor": "IE9IuPkpzj7Gc9ZECUoXGNHUmaivjmSay67m1kp8pGZeAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMQ==" @@ -89,24 +89,24 @@ Response: { } }, { - "cursor": "IHn6nT28QrSp7jJEduK+ySatgN2L/nm6EVbYx6SAEJDbAQAAAAAAAAA=", + "cursor": "IGKXqUmLK5Cw65mduLyUaGa10W674jukw3hOE4lqusphAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==" + "bcs": "A2RmMg==" }, "value": { - "json": "df3" + "json": "df2" } } }, { - "cursor": "IHtiNdxhxr2hdi8FNtuIiaPnrUikJpodCh4bfSrTYUpVAQAAAAAAAAA=", + "cursor": "IGZ2lOjt6inS/IYJm4vOaw4kzNZ4ieZtyOC7flwMytM7AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmMw==" }, "value": { - "json": "df2" + "json": "df3" } } } @@ -201,7 +201,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "ICX2vpajAlJ8NJOOAOxRREhN1+jQRI0zPn1nZF+rpwKxAgAAAAAAAAA=", + "cursor": "IE9IuPkpzj7Gc9ZECUoXGNHUmaivjmSay67m1kp8pGZeAgAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMQ==" @@ -212,24 +212,24 @@ Response: { } }, { - "cursor": "IHn6nT28QrSp7jJEduK+ySatgN2L/nm6EVbYx6SAEJDbAgAAAAAAAAA=", + "cursor": "IGKXqUmLK5Cw65mduLyUaGa10W674jukw3hOE4lqusphAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==" + "bcs": "A2RmMg==" }, "value": { - "json": "df3" + "json": "df2" } } }, { - "cursor": "IHtiNdxhxr2hdi8FNtuIiaPnrUikJpodCh4bfSrTYUpVAgAAAAAAAAA=", + "cursor": "IGZ2lOjt6inS/IYJm4vOaw4kzNZ4ieZtyOC7flwMytM7AgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmMw==" }, "value": { - "json": "df2" + "json": "df3" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp index d7f70751066..895f328339d 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp @@ -41,7 +41,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IEnrodHOUwhsq9v06Kh0+DvC+c7wwbItmXfUFpHfkBuHAQAAAAAAAAA=", + "cursor": "IBakRk0wXS3tNzIdsaonmkZrKU5oOt6nipGT9cAdnmvMAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -49,7 +49,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "0" } } @@ -65,7 +65,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "0" } } @@ -77,7 +77,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IEnrodHOUwhsq9v06Kh0+DvC+c7wwbItmXfUFpHfkBuHAQAAAAAAAAA=", + "cursor": "IBakRk0wXS3tNzIdsaonmkZrKU5oOt6nipGT9cAdnmvMAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "0" } } @@ -101,7 +101,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "0" } } @@ -117,7 +117,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "0" } } @@ -168,7 +168,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "0" } } @@ -202,7 +202,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IEnrodHOUwhsq9v06Kh0+DvC+c7wwbItmXfUFpHfkBuHAwAAAAAAAAA=", + "cursor": "IBakRk0wXS3tNzIdsaonmkZrKU5oOt6nipGT9cAdnmvMAwAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -210,7 +210,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "1" } } @@ -226,7 +226,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "1" } } @@ -238,7 +238,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IEnrodHOUwhsq9v06Kh0+DvC+c7wwbItmXfUFpHfkBuHAwAAAAAAAAA=", + "cursor": "IBakRk0wXS3tNzIdsaonmkZrKU5oOt6nipGT9cAdnmvMAwAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -246,7 +246,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "1" } } @@ -262,7 +262,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "1" } } @@ -283,7 +283,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xd4716b7b0c9c1cb17bbe35454f230ec89e547d584216c7477e0f82d86e73d2ed", + "id": "0x7d893ec96023f27cb707ebe80ae118dccf08f2aeda9a17e5340abed5296ef887", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp index 5ac0967a5e7..3786c7d7a08 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp @@ -62,11 +62,11 @@ Response: { "nodes": [ { "value": { - "address": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "address": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "version": 5, "contents": { "json": { - "id": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "id": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "count": "0" } }, @@ -90,11 +90,11 @@ Response: { "nodes": [ { "value": { - "address": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "address": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "version": 5, "contents": { "json": { - "id": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "id": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "count": "0" } }, @@ -102,11 +102,11 @@ Response: { "nodes": [ { "value": { - "address": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "address": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "version": 6, "contents": { "json": { - "id": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "id": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "count": "0" } } @@ -131,11 +131,11 @@ Response: { "nodes": [ { "value": { - "address": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "address": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "version": 7, "contents": { "json": { - "id": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "id": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "count": "1" } }, @@ -143,11 +143,11 @@ Response: { "nodes": [ { "value": { - "address": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "address": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "version": 6, "contents": { "json": { - "id": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "id": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "count": "0" } } @@ -172,11 +172,11 @@ Response: { "nodes": [ { "value": { - "address": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "address": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "version": 7, "contents": { "json": { - "id": "0xfa2cc1f216b79aa7ea2a8d761cec51908a75a7d36544ed0aaa4a39366a615ebc", + "id": "0x6de741c37f0ce8d820218bf0e4e3dcde7c8d8ab0cc8e0360d22eefaba593ab14", "count": "1" } }, @@ -184,11 +184,11 @@ Response: { "nodes": [ { "value": { - "address": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "address": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "version": 8, "contents": { "json": { - "id": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "id": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "count": "1" } } @@ -233,11 +233,11 @@ Response: { "nodes": [ { "value": { - "address": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "address": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "version": 6, "contents": { "json": { - "id": "0x9163827f54a0c8c755cdd0c7ba5a2e6e90e3b7cf268281bf6ff0b512631a91c7", + "id": "0x26ed3a96ca9b5f6bfa4ff248359b3cd96b689942a85094e3dd1cede5a3dcbffb", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp index fc1f0124379..88df0d3b26b 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp @@ -41,19 +41,19 @@ Response: { { "cursor": "eyJjIjozLCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "64qAV8FFh1QVid2xtt1Xv1jiHVm8kpwYui3jBXDMbfmT" + "digest": "ABGGTqgdfGbSBVgFEX813XXNsF8MdJZWpqMcH2nnSNFm" } }, { "cursor": "eyJjIjozLCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "FSABM7y1qrcK8GiQFWQMDUHhyWSeYYCeBqtT55ZHYmQq" + "digest": "F38xN3PwMBykv1y7ib7JdJ1BL9cQAEgFePTtMmggiWRF" } }, { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU" + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq" } }, { @@ -154,19 +154,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9", "node": { - "digest": "64qAV8FFh1QVid2xtt1Xv1jiHVm8kpwYui3jBXDMbfmT" + "digest": "ABGGTqgdfGbSBVgFEX813XXNsF8MdJZWpqMcH2nnSNFm" } }, { "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9", "node": { - "digest": "FSABM7y1qrcK8GiQFWQMDUHhyWSeYYCeBqtT55ZHYmQq" + "digest": "F38xN3PwMBykv1y7ib7JdJ1BL9cQAEgFePTtMmggiWRF" } }, { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU" + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq" } }, { @@ -183,19 +183,19 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "64qAV8FFh1QVid2xtt1Xv1jiHVm8kpwYui3jBXDMbfmT" + "digest": "ABGGTqgdfGbSBVgFEX813XXNsF8MdJZWpqMcH2nnSNFm" } }, { "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "FSABM7y1qrcK8GiQFWQMDUHhyWSeYYCeBqtT55ZHYmQq" + "digest": "F38xN3PwMBykv1y7ib7JdJ1BL9cQAEgFePTtMmggiWRF" } }, { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU" + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq" } } ] @@ -207,19 +207,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "J7gXZTXkH2A2Q5YfmBXqrSszGrPC17LjcjzcpGhs5VFh" + "digest": "GYWosM2BJaJK6K1bAyAzEGLhEVXzQaP3CKgRpb3MJJCM" } }, { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "9BWpbEeK1ti6kr8byL9RaSPpxqdYS9BVYvs391e3BReZ" + "digest": "D6x1kDu7GkY4GVPBpnM2s3MXwJt3DeoKAHMfSgBNvLpB" } }, { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT" + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS" } }, { @@ -236,19 +236,19 @@ Response: { { "cursor": "eyJjIjo4LCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "64qAV8FFh1QVid2xtt1Xv1jiHVm8kpwYui3jBXDMbfmT" + "digest": "ABGGTqgdfGbSBVgFEX813XXNsF8MdJZWpqMcH2nnSNFm" } }, { "cursor": "eyJjIjo4LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "FSABM7y1qrcK8GiQFWQMDUHhyWSeYYCeBqtT55ZHYmQq" + "digest": "F38xN3PwMBykv1y7ib7JdJ1BL9cQAEgFePTtMmggiWRF" } }, { "cursor": "eyJjIjo4LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU" + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq" } }, { @@ -260,19 +260,19 @@ Response: { { "cursor": "eyJjIjo4LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "J7gXZTXkH2A2Q5YfmBXqrSszGrPC17LjcjzcpGhs5VFh" + "digest": "GYWosM2BJaJK6K1bAyAzEGLhEVXzQaP3CKgRpb3MJJCM" } }, { "cursor": "eyJjIjo4LCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "9BWpbEeK1ti6kr8byL9RaSPpxqdYS9BVYvs391e3BReZ" + "digest": "D6x1kDu7GkY4GVPBpnM2s3MXwJt3DeoKAHMfSgBNvLpB" } }, { "cursor": "eyJjIjo4LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT" + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS" } } ] @@ -284,19 +284,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "G3HAB2s6Nbpt4UkxifXQbnM7Xw2UAFiyzZTEc4XznUyx" + "digest": "4FVMQcFWT7gS2sF8xkXa83SP2NBWQW8QkGSn7WENWScv" } }, { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "AfGFGv7NQ2dnJybrkZyueHGffm6dtDf53drJDTQ35QHj" + "digest": "CMquL9ZpHdvR786ZdBQY8Jc4RzgPsaY9p18jPwqPNWyb" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "9GASeNsMNUdoXoZYaCQM93gNfwLA3oXFWq7SEGLjmVRf" + "digest": "9Z3KC269nkjziG87HMVdixCsnmBMo2mjQJSka3C3k7c5" } }, { @@ -313,19 +313,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9", "node": { - "digest": "64qAV8FFh1QVid2xtt1Xv1jiHVm8kpwYui3jBXDMbfmT" + "digest": "ABGGTqgdfGbSBVgFEX813XXNsF8MdJZWpqMcH2nnSNFm" } }, { "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9", "node": { - "digest": "FSABM7y1qrcK8GiQFWQMDUHhyWSeYYCeBqtT55ZHYmQq" + "digest": "F38xN3PwMBykv1y7ib7JdJ1BL9cQAEgFePTtMmggiWRF" } }, { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU" + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq" } }, { @@ -337,19 +337,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "J7gXZTXkH2A2Q5YfmBXqrSszGrPC17LjcjzcpGhs5VFh" + "digest": "GYWosM2BJaJK6K1bAyAzEGLhEVXzQaP3CKgRpb3MJJCM" } }, { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "9BWpbEeK1ti6kr8byL9RaSPpxqdYS9BVYvs391e3BReZ" + "digest": "D6x1kDu7GkY4GVPBpnM2s3MXwJt3DeoKAHMfSgBNvLpB" } }, { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT" + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS" } }, { @@ -361,19 +361,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "G3HAB2s6Nbpt4UkxifXQbnM7Xw2UAFiyzZTEc4XznUyx" + "digest": "4FVMQcFWT7gS2sF8xkXa83SP2NBWQW8QkGSn7WENWScv" } }, { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "AfGFGv7NQ2dnJybrkZyueHGffm6dtDf53drJDTQ35QHj" + "digest": "CMquL9ZpHdvR786ZdBQY8Jc4RzgPsaY9p18jPwqPNWyb" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "9GASeNsMNUdoXoZYaCQM93gNfwLA3oXFWq7SEGLjmVRf" + "digest": "9Z3KC269nkjziG87HMVdixCsnmBMo2mjQJSka3C3k7c5" } } ] @@ -395,13 +395,13 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "FSABM7y1qrcK8GiQFWQMDUHhyWSeYYCeBqtT55ZHYmQq" + "digest": "F38xN3PwMBykv1y7ib7JdJ1BL9cQAEgFePTtMmggiWRF" } }, { "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU" + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq" } }, { @@ -420,13 +420,13 @@ Response: { { "cursor": "eyJjIjoxMSwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "9BWpbEeK1ti6kr8byL9RaSPpxqdYS9BVYvs391e3BReZ" + "digest": "D6x1kDu7GkY4GVPBpnM2s3MXwJt3DeoKAHMfSgBNvLpB" } }, { "cursor": "eyJjIjoxMSwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT" + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS" } }, { @@ -445,13 +445,13 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "AfGFGv7NQ2dnJybrkZyueHGffm6dtDf53drJDTQ35QHj" + "digest": "CMquL9ZpHdvR786ZdBQY8Jc4RzgPsaY9p18jPwqPNWyb" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "9GASeNsMNUdoXoZYaCQM93gNfwLA3oXFWq7SEGLjmVRf" + "digest": "9Z3KC269nkjziG87HMVdixCsnmBMo2mjQJSka3C3k7c5" } }, { @@ -480,7 +480,7 @@ Response: { { "cursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU" + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq" } } ] @@ -493,7 +493,7 @@ Response: { { "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT" + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS" } } ] @@ -506,7 +506,7 @@ Response: { { "cursor": "eyJjIjoxMCwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "9GASeNsMNUdoXoZYaCQM93gNfwLA3oXFWq7SEGLjmVRf" + "digest": "9Z3KC269nkjziG87HMVdixCsnmBMo2mjQJSka3C3k7c5" } } ] @@ -527,24 +527,24 @@ Response: { { "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT", + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS", "sender": { "objects": { "edges": [ { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcBgAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LBgAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92BgAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51BgAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0BgAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlBgAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxBgAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdBgAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLBgAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZBgAAAAAAAAA=" } ] } @@ -558,33 +558,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "7LQdDgCP9z8L8yDiYCCty5UZhEqXKToJHgoJy23w2QaU", + "digest": "HiXDWSzttthgmugRmbVpXTpM8KdwkG6aBeTVPWZYevXq", "sender": { "objects": { "edges": [ { - "cursor": "ICau+8m9U/BxYYOT+q8fWcHzs5Do7X/MPQObg2YBV0k9DAAAAAAAAAA=" + "cursor": "IAn4soSzkHI/WlbWHXpXNSY/E1FfKLRrUGlQwW2cnaihDAAAAAAAAAA=" }, { - "cursor": "ID8bW9f+ADo3XxGoCZkDmn++5c6yU2eFCKNn6A7daJgGDAAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LDAAAAAAAAAA=" }, { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcDAAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51DAAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92DAAAAAAAAAA=" + "cursor": "IDR5RQIGvilDZLGJWcWXMK4yrX8ut3bDk9+XpzsxZq08DAAAAAAAAAA=" }, { - "cursor": "IIU5crV+5IieQs3ytmtn3BcztLDg2RmLxNAjNcd/QpQtDAAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlDAAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0DAAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdDAAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxDAAAAAAAAAA=" + "cursor": "IKfXrzL4iyrIDBgwA8UL5av0Xbc+GYXbR4MCwnCDdaH8DAAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLDAAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZDAAAAAAAAAA=" } ] } @@ -594,33 +594,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "J7gXZTXkH2A2Q5YfmBXqrSszGrPC17LjcjzcpGhs5VFh", + "digest": "GYWosM2BJaJK6K1bAyAzEGLhEVXzQaP3CKgRpb3MJJCM", "sender": { "objects": { "edges": [ { - "cursor": "ICau+8m9U/BxYYOT+q8fWcHzs5Do7X/MPQObg2YBV0k9DAAAAAAAAAA=" + "cursor": "IAn4soSzkHI/WlbWHXpXNSY/E1FfKLRrUGlQwW2cnaihDAAAAAAAAAA=" }, { - "cursor": "ID8bW9f+ADo3XxGoCZkDmn++5c6yU2eFCKNn6A7daJgGDAAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LDAAAAAAAAAA=" }, { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcDAAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51DAAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92DAAAAAAAAAA=" + "cursor": "IDR5RQIGvilDZLGJWcWXMK4yrX8ut3bDk9+XpzsxZq08DAAAAAAAAAA=" }, { - "cursor": "IIU5crV+5IieQs3ytmtn3BcztLDg2RmLxNAjNcd/QpQtDAAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlDAAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0DAAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdDAAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxDAAAAAAAAAA=" + "cursor": "IKfXrzL4iyrIDBgwA8UL5av0Xbc+GYXbR4MCwnCDdaH8DAAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLDAAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZDAAAAAAAAAA=" } ] } @@ -630,33 +630,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "9BWpbEeK1ti6kr8byL9RaSPpxqdYS9BVYvs391e3BReZ", + "digest": "D6x1kDu7GkY4GVPBpnM2s3MXwJt3DeoKAHMfSgBNvLpB", "sender": { "objects": { "edges": [ { - "cursor": "ICau+8m9U/BxYYOT+q8fWcHzs5Do7X/MPQObg2YBV0k9DAAAAAAAAAA=" + "cursor": "IAn4soSzkHI/WlbWHXpXNSY/E1FfKLRrUGlQwW2cnaihDAAAAAAAAAA=" }, { - "cursor": "ID8bW9f+ADo3XxGoCZkDmn++5c6yU2eFCKNn6A7daJgGDAAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LDAAAAAAAAAA=" }, { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcDAAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51DAAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92DAAAAAAAAAA=" + "cursor": "IDR5RQIGvilDZLGJWcWXMK4yrX8ut3bDk9+XpzsxZq08DAAAAAAAAAA=" }, { - "cursor": "IIU5crV+5IieQs3ytmtn3BcztLDg2RmLxNAjNcd/QpQtDAAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlDAAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0DAAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdDAAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxDAAAAAAAAAA=" + "cursor": "IKfXrzL4iyrIDBgwA8UL5av0Xbc+GYXbR4MCwnCDdaH8DAAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLDAAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZDAAAAAAAAAA=" } ] } @@ -666,33 +666,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "AEW55aznWniryZBnGqbfUNfqCn3Y7vxRKyjB3qQstyUT", + "digest": "3dvmy8FT1rnUp7VVk28E1Ct5DhXXok9WZ3bg8buethCS", "sender": { "objects": { "edges": [ { - "cursor": "ICau+8m9U/BxYYOT+q8fWcHzs5Do7X/MPQObg2YBV0k9DAAAAAAAAAA=" + "cursor": "IAn4soSzkHI/WlbWHXpXNSY/E1FfKLRrUGlQwW2cnaihDAAAAAAAAAA=" }, { - "cursor": "ID8bW9f+ADo3XxGoCZkDmn++5c6yU2eFCKNn6A7daJgGDAAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LDAAAAAAAAAA=" }, { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcDAAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51DAAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92DAAAAAAAAAA=" + "cursor": "IDR5RQIGvilDZLGJWcWXMK4yrX8ut3bDk9+XpzsxZq08DAAAAAAAAAA=" }, { - "cursor": "IIU5crV+5IieQs3ytmtn3BcztLDg2RmLxNAjNcd/QpQtDAAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlDAAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0DAAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdDAAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxDAAAAAAAAAA=" + "cursor": "IKfXrzL4iyrIDBgwA8UL5av0Xbc+GYXbR4MCwnCDdaH8DAAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLDAAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZDAAAAAAAAAA=" } ] } @@ -702,33 +702,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "G3HAB2s6Nbpt4UkxifXQbnM7Xw2UAFiyzZTEc4XznUyx", + "digest": "4FVMQcFWT7gS2sF8xkXa83SP2NBWQW8QkGSn7WENWScv", "sender": { "objects": { "edges": [ { - "cursor": "ICau+8m9U/BxYYOT+q8fWcHzs5Do7X/MPQObg2YBV0k9DAAAAAAAAAA=" + "cursor": "IAn4soSzkHI/WlbWHXpXNSY/E1FfKLRrUGlQwW2cnaihDAAAAAAAAAA=" }, { - "cursor": "ID8bW9f+ADo3XxGoCZkDmn++5c6yU2eFCKNn6A7daJgGDAAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LDAAAAAAAAAA=" }, { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcDAAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51DAAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92DAAAAAAAAAA=" + "cursor": "IDR5RQIGvilDZLGJWcWXMK4yrX8ut3bDk9+XpzsxZq08DAAAAAAAAAA=" }, { - "cursor": "IIU5crV+5IieQs3ytmtn3BcztLDg2RmLxNAjNcd/QpQtDAAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlDAAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0DAAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdDAAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxDAAAAAAAAAA=" + "cursor": "IKfXrzL4iyrIDBgwA8UL5av0Xbc+GYXbR4MCwnCDdaH8DAAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLDAAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZDAAAAAAAAAA=" } ] } @@ -738,33 +738,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "AfGFGv7NQ2dnJybrkZyueHGffm6dtDf53drJDTQ35QHj", + "digest": "CMquL9ZpHdvR786ZdBQY8Jc4RzgPsaY9p18jPwqPNWyb", "sender": { "objects": { "edges": [ { - "cursor": "ICau+8m9U/BxYYOT+q8fWcHzs5Do7X/MPQObg2YBV0k9DAAAAAAAAAA=" + "cursor": "IAn4soSzkHI/WlbWHXpXNSY/E1FfKLRrUGlQwW2cnaihDAAAAAAAAAA=" }, { - "cursor": "ID8bW9f+ADo3XxGoCZkDmn++5c6yU2eFCKNn6A7daJgGDAAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LDAAAAAAAAAA=" }, { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcDAAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51DAAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92DAAAAAAAAAA=" + "cursor": "IDR5RQIGvilDZLGJWcWXMK4yrX8ut3bDk9+XpzsxZq08DAAAAAAAAAA=" }, { - "cursor": "IIU5crV+5IieQs3ytmtn3BcztLDg2RmLxNAjNcd/QpQtDAAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlDAAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0DAAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdDAAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxDAAAAAAAAAA=" + "cursor": "IKfXrzL4iyrIDBgwA8UL5av0Xbc+GYXbR4MCwnCDdaH8DAAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLDAAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZDAAAAAAAAAA=" } ] } @@ -774,33 +774,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "9GASeNsMNUdoXoZYaCQM93gNfwLA3oXFWq7SEGLjmVRf", + "digest": "9Z3KC269nkjziG87HMVdixCsnmBMo2mjQJSka3C3k7c5", "sender": { "objects": { "edges": [ { - "cursor": "ICau+8m9U/BxYYOT+q8fWcHzs5Do7X/MPQObg2YBV0k9DAAAAAAAAAA=" + "cursor": "IAn4soSzkHI/WlbWHXpXNSY/E1FfKLRrUGlQwW2cnaihDAAAAAAAAAA=" }, { - "cursor": "ID8bW9f+ADo3XxGoCZkDmn++5c6yU2eFCKNn6A7daJgGDAAAAAAAAAA=" + "cursor": "IBUtKgcc69n6vrgae0m6bsZFM+VKO98YT7fDq7OioK8LDAAAAAAAAAA=" }, { - "cursor": "IEMSS3Fhv6Qk0EdccWtU0a1VBS7kuesq8Tpx3MPmJ5EcDAAAAAAAAAA=" + "cursor": "IC/ckqnx/7jys4/ecC3dOsOHMC5WwGb9BXUfZi3Ddh51DAAAAAAAAAA=" }, { - "cursor": "IIE/Mhs/6ou9DjEgf0gswMS7PQW7F9voEf/ZIMmL1w92DAAAAAAAAAA=" + "cursor": "IDR5RQIGvilDZLGJWcWXMK4yrX8ut3bDk9+XpzsxZq08DAAAAAAAAAA=" }, { - "cursor": "IIU5crV+5IieQs3ytmtn3BcztLDg2RmLxNAjNcd/QpQtDAAAAAAAAAA=" + "cursor": "IIGw2J6GfaumBeJKnePTTCMQjH7EUHc0/bXeltP9qhLlDAAAAAAAAAA=" }, { - "cursor": "IIVEcitZ9oi0uYE+BIgns9/K00EwN6YKc5LirlAnccD0DAAAAAAAAAA=" + "cursor": "IJ/0O4/9dyF6NSN2xo6dVRrF75TFrt3mahKv1H0obEsdDAAAAAAAAAA=" }, { - "cursor": "IPGnNzcr/kIu4vEiNW1SHqVFJUmzLiUHE4vw6xvl4gZxDAAAAAAAAAA=" + "cursor": "IKfXrzL4iyrIDBgwA8UL5av0Xbc+GYXbR4MCwnCDdaH8DAAAAAAAAAA=" }, { - "cursor": "IPT/b/mZ3AfOxxin82sErAcyEbyHI5h3Aa+TuhHq/rDLDAAAAAAAAAA=" + "cursor": "IMAL6QY/CtFL+h9Q5iOwaR4NA7XP3FvIdL0e18MHoPxZDAAAAAAAAAA=" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp index 7cb9ebf3226..8f622d111f2 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp @@ -29,7 +29,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "0" } } @@ -57,7 +57,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "1" } } @@ -69,7 +69,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "0" } } @@ -104,7 +104,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "1" } } @@ -134,7 +134,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "1" } } @@ -151,7 +151,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "0" } } @@ -205,7 +205,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "1" } } @@ -222,7 +222,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xb0767d09856a09d085e614a38e93f74d3d8b56a4fbcad3cd5761b3ebd190ac8f", + "id": "0x940ef0aa85a6738896eade895c63afeb0f25682729ae518a03df79978325154e", "value": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp index 9c5c24574c6..95a70d87d09 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp @@ -36,10 +36,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", "value": "1" } } @@ -80,10 +80,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", "value": "1" } } @@ -105,14 +105,14 @@ Response: { "objects": { "nodes": [ { - "version": 3, + "version": 6, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } } }, @@ -120,23 +120,23 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x5c880584b84e3ca0371d4b2d184357a5daeaa47f7ff28c0c11811bcb33a48cb6", + "id": "0x6bb2ccafbfd0bb122c3b2e344a088e2c5cb912082cda8afd5e16c5a3fea5f6e4", "value": "2" } } }, { - "version": 6, + "version": 3, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } } }, @@ -144,10 +144,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", "value": "1" } } @@ -166,14 +166,14 @@ Response: { "objects": { "nodes": [ { - "version": 3, + "version": 6, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } } }, @@ -181,23 +181,23 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x5c880584b84e3ca0371d4b2d184357a5daeaa47f7ff28c0c11811bcb33a48cb6", + "id": "0x6bb2ccafbfd0bb122c3b2e344a088e2c5cb912082cda8afd5e16c5a3fea5f6e4", "value": "2" } } }, { - "version": 6, + "version": 3, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } } }, @@ -205,10 +205,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", "value": "1" } } @@ -237,14 +237,14 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 3, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } }, "owner_at_latest_state_has_iota_only": { @@ -252,14 +252,14 @@ Response: { "objects": { "nodes": [ { - "version": 3, + "version": 6, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } } }, @@ -267,49 +267,49 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x5c880584b84e3ca0371d4b2d184357a5daeaa47f7ff28c0c11811bcb33a48cb6", + "id": "0x6bb2ccafbfd0bb122c3b2e344a088e2c5cb912082cda8afd5e16c5a3fea5f6e4", "value": "2" } } }, { - "version": 6, + "version": 1, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", + "balance": { + "value": "300000000000000" + } } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", - "value": "1" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } } }, { - "version": 1, + "version": 4, "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", - "balance": { - "value": "300000000000000" - } + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", + "value": "1" } } } @@ -322,10 +322,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", "value": "1" } }, @@ -334,14 +334,14 @@ Response: { "objects": { "nodes": [ { - "version": 3, + "version": 6, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } } }, @@ -349,49 +349,49 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x5c880584b84e3ca0371d4b2d184357a5daeaa47f7ff28c0c11811bcb33a48cb6", + "id": "0x6bb2ccafbfd0bb122c3b2e344a088e2c5cb912082cda8afd5e16c5a3fea5f6e4", "value": "2" } } }, { - "version": 6, + "version": 1, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", + "balance": { + "value": "300000000000000" + } } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", - "value": "1" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } } }, { - "version": 1, + "version": 4, "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", - "balance": { - "value": "300000000000000" - } + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", + "value": "1" } } } @@ -406,15 +406,15 @@ Response: { "before_obj_6_0_at_checkpoint_2": { "nodes": [ { - "version": 3, + "version": 6, "asMoveObject": { "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } }, "note_that_owner_result_should_reflect_latest_state": { @@ -422,14 +422,14 @@ Response: { "objects": { "nodes": [ { - "version": 3, + "version": 6, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } } }, @@ -437,49 +437,49 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x5c880584b84e3ca0371d4b2d184357a5daeaa47f7ff28c0c11811bcb33a48cb6", + "id": "0x6bb2ccafbfd0bb122c3b2e344a088e2c5cb912082cda8afd5e16c5a3fea5f6e4", "value": "2" } } }, { - "version": 6, + "version": 1, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", + "balance": { + "value": "300000000000000" + } } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", - "value": "1" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } } }, { - "version": 1, + "version": 4, "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", - "balance": { - "value": "300000000000000" - } + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", + "value": "1" } } } @@ -544,11 +544,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } } }, @@ -556,10 +556,10 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x5c880584b84e3ca0371d4b2d184357a5daeaa47f7ff28c0c11811bcb33a48cb6", + "id": "0x6bb2ccafbfd0bb122c3b2e344a088e2c5cb912082cda8afd5e16c5a3fea5f6e4", "value": "2" } } @@ -568,11 +568,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } } }, @@ -580,10 +580,10 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", "value": "1" } } @@ -602,14 +602,14 @@ Response: { "objects": { "nodes": [ { - "version": 3, + "version": 6, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x1bc78cc3d9e67f850e9c92937fd5c7160e414ba63510899cd5a30a2e12bf6cae", - "value": "0" + "id": "0x406805acb96f437d91727f65e50fae6510f6bd7b6a9d1c7afc503cba301ffa5d", + "value": "3" } } }, @@ -617,23 +617,23 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0x5c880584b84e3ca0371d4b2d184357a5daeaa47f7ff28c0c11811bcb33a48cb6", + "id": "0x6bb2ccafbfd0bb122c3b2e344a088e2c5cb912082cda8afd5e16c5a3fea5f6e4", "value": "2" } } }, { - "version": 6, + "version": 3, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xbf14a0de0dc4b3f49950c8254c0bb5ad03eeacbd1d11e61afe8e6fc4d8c7c3c7", - "value": "3" + "id": "0xc6258e27dcf00eb453b1a676591da10636befacc85e5b720bd080a4a6d03e291", + "value": "0" } } }, @@ -641,10 +641,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xfbe12acb50de868fcbdb0f033eacc0f1ece581db78b5a18337285c25cfe4cf6e::M1::Object" + "repr": "0x73965bb8004644cc90ae3191a5c20d3058529b1381c68884c3f528b41a38566d::M1::Object" }, "json": { - "id": "0xecdb6caab8fa938786fea0e801e81133c31da2f87a2beea2325268f30545af5f", + "id": "0xfef5e4ff7922050c5302a8392b16d22d998cdbfc16f06b703182f066c733950f", "value": "1" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp index 4cc618441f1..10b35eb40d0 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp @@ -35,27 +35,27 @@ task 6, lines 38-66: Response: { "data": { "after_obj_3_0": { - "objects": { - "nodes": [] - } - }, - "before_obj_3_0": { "objects": { "nodes": [ { "version": 4, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", "value": "100" } } } ] } + }, + "before_obj_3_0": { + "objects": { + "nodes": [] + } } } } @@ -74,27 +74,27 @@ task 9, lines 72-101: Response: { "data": { "after_obj_3_0_chkpt_1": { - "objects": { - "nodes": [] - } - }, - "before_obj_3_0_chkpt_1": { "objects": { "nodes": [ { "version": 4, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", "value": "100" } } } ] } + }, + "before_obj_3_0_chkpt_1": { + "objects": { + "nodes": [] + } } } } @@ -107,26 +107,26 @@ Response: { "objects": { "nodes": [ { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", - "value": "200" + "id": "0x18b6c49f106352ac99e2986238a6b4f067dc4d1b2fb5ebda61f5ae152def0415", + "value": "1" } } }, { - "version": 4, + "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xf8cc9d41404f9c4148a422518eb89e9569f458b32497beb682810cfdc405e431", - "value": "1" + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", + "value": "200" } } } @@ -134,21 +134,16 @@ Response: { } }, "after_obj_3_0_chkpt_2": { - "consistent_with_above": { - "nodes": [] - } - }, - "before_obj_3_0_chkpt_2": { "consistent_with_above": { "nodes": [ { "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", "value": "200" } }, @@ -157,26 +152,26 @@ Response: { "objects": { "nodes": [ { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", - "value": "200" + "id": "0x18b6c49f106352ac99e2986238a6b4f067dc4d1b2fb5ebda61f5ae152def0415", + "value": "1" } } }, { - "version": 4, + "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xf8cc9d41404f9c4148a422518eb89e9569f458b32497beb682810cfdc405e431", - "value": "1" + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", + "value": "200" } } } @@ -187,6 +182,11 @@ Response: { } ] } + }, + "before_obj_3_0_chkpt_2": { + "consistent_with_above": { + "nodes": [] + } } } } @@ -205,21 +205,16 @@ task 13, lines 184-247: Response: { "data": { "after_obj_3_0_chkpt_2": { - "objects": { - "nodes": [] - } - }, - "before_obj_3_0_chkpt_2": { "objects": { "nodes": [ { "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", "value": "200" } }, @@ -228,26 +223,26 @@ Response: { "objects": { "nodes": [ { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", - "value": "200" + "id": "0x18b6c49f106352ac99e2986238a6b4f067dc4d1b2fb5ebda61f5ae152def0415", + "value": "1" } } }, { - "version": 4, + "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xf8cc9d41404f9c4148a422518eb89e9569f458b32497beb682810cfdc405e431", - "value": "1" + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", + "value": "200" } } } @@ -258,6 +253,11 @@ Response: { } ] } + }, + "before_obj_3_0_chkpt_2": { + "objects": { + "nodes": [] + } } } } @@ -270,26 +270,26 @@ Response: { "objects": { "nodes": [ { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", - "value": "200" + "id": "0x18b6c49f106352ac99e2986238a6b4f067dc4d1b2fb5ebda61f5ae152def0415", + "value": "300" } } }, { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xf8cc9d41404f9c4148a422518eb89e9569f458b32497beb682810cfdc405e431", - "value": "300" + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", + "value": "200" } } } @@ -297,21 +297,16 @@ Response: { } }, "after_obj_3_0_chkpt_3": { - "consistent_with_above": { - "nodes": [] - } - }, - "before_obj_3_0_chkpt_3": { "consistent_with_above": { "nodes": [ { "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", "value": "200" } }, @@ -320,26 +315,26 @@ Response: { "objects": { "nodes": [ { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xdb0a7c9819a12e4c0d5486b38c987b132efd8234b072eb79bf1804e877e9e066", - "value": "200" + "id": "0x18b6c49f106352ac99e2986238a6b4f067dc4d1b2fb5ebda61f5ae152def0415", + "value": "300" } } }, { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xcd41eea5620695d437aec739e7f9843d04e0f667f542882ff3766801d32bce8e::M1::Object" + "repr": "0x95f4a1d2d5582b427011e693b2714539d438a688d8500f7a4e22a999a3cbd10b::M1::Object" }, "json": { - "id": "0xf8cc9d41404f9c4148a422518eb89e9569f458b32497beb682810cfdc405e431", - "value": "300" + "id": "0xc16f65c685f0a3e6215e69ce45212ecb3d2e52e69f39e30b0f91a3828cfd5de2", + "value": "200" } } } @@ -350,6 +345,11 @@ Response: { } ] } + }, + "before_obj_3_0_chkpt_3": { + "consistent_with_above": { + "nodes": [] + } } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp index f649ba58829..01e72a2b08e 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp @@ -35,11 +35,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe3a07465d39e26c531f30034ccde365447957dd23cbea0039f00e509d34a1eb", - "value": "231" + "id": "0xffbb556992aeb48a80e98d0df29aa55b3338ab1efcf084ce409a6e0a4d8a4133", + "value": "217" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -54,11 +54,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -76,11 +76,11 @@ Response: { }, "contents": { "json": { - "id": "0xfddc5c961a6f284cb49f48994657d5a8f4209d058635451d2f9b63d4a6c71473", - "value": "38" + "id": "0xff3acaaf7f85c3d9e01921207b614dbf001a67cbbe783f462c6d4959a3f0c130", + "value": "327" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } }, @@ -92,11 +92,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe2bb1c95497ab25fab8204f24d2af7e71493d5d8f6f10e973004ef3b779405e", - "value": "305" + "id": "0xffb051b434fa4cbc6862e11dc7aa2d96e3f9f1a4b70fc6f15ba0c14de82c948f", + "value": "218" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } }, @@ -108,11 +108,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe3a07465d39e26c531f30034ccde365447957dd23cbea0039f00e509d34a1eb", - "value": "231" + "id": "0xffbb556992aeb48a80e98d0df29aa55b3338ab1efcf084ce409a6e0a4d8a4133", + "value": "217" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } }, @@ -124,11 +124,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -163,7 +163,7 @@ Contents: Test::M1::Object { bytes: fake(2,498), }, }, - value: 231u64, + value: 217u64, } task 9, line 93: @@ -176,7 +176,7 @@ Contents: Test::M1::Object { bytes: fake(2,497), }, }, - value: 305u64, + value: 218u64, } task 10, line 95: @@ -199,11 +199,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe2bb1c95497ab25fab8204f24d2af7e71493d5d8f6f10e973004ef3b779405e", - "value": "305" + "id": "0xffb051b434fa4cbc6862e11dc7aa2d96e3f9f1a4b70fc6f15ba0c14de82c948f", + "value": "218" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -218,11 +218,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe3a07465d39e26c531f30034ccde365447957dd23cbea0039f00e509d34a1eb", - "value": "231" + "id": "0xffbb556992aeb48a80e98d0df29aa55b3338ab1efcf084ce409a6e0a4d8a4133", + "value": "217" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -237,11 +237,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -260,11 +260,11 @@ Response: { }, "contents": { "json": { - "id": "0xfddc5c961a6f284cb49f48994657d5a8f4209d058635451d2f9b63d4a6c71473", - "value": "38" + "id": "0xff3acaaf7f85c3d9e01921207b614dbf001a67cbbe783f462c6d4959a3f0c130", + "value": "327" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -287,11 +287,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -305,11 +305,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -325,11 +325,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe2bb1c95497ab25fab8204f24d2af7e71493d5d8f6f10e973004ef3b779405e", - "value": "305" + "id": "0xffb051b434fa4cbc6862e11dc7aa2d96e3f9f1a4b70fc6f15ba0c14de82c948f", + "value": "218" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -343,11 +343,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe3a07465d39e26c531f30034ccde365447957dd23cbea0039f00e509d34a1eb", - "value": "231" + "id": "0xffbb556992aeb48a80e98d0df29aa55b3338ab1efcf084ce409a6e0a4d8a4133", + "value": "217" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -361,11 +361,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -383,11 +383,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe2bb1c95497ab25fab8204f24d2af7e71493d5d8f6f10e973004ef3b779405e", - "value": "305" + "id": "0xffb051b434fa4cbc6862e11dc7aa2d96e3f9f1a4b70fc6f15ba0c14de82c948f", + "value": "218" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -401,11 +401,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe3a07465d39e26c531f30034ccde365447957dd23cbea0039f00e509d34a1eb", - "value": "231" + "id": "0xffbb556992aeb48a80e98d0df29aa55b3338ab1efcf084ce409a6e0a4d8a4133", + "value": "217" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -419,11 +419,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } @@ -442,7 +442,7 @@ Response: { }, "contents": { "json": { - "id": "0x604cdc46957129d4346930afbaa1efae4f583e4a4fb1ecf901427fbe87eb915f", + "id": "0x4b5222b0b18ec70dba044437a55632e2e359a1dedce8fdca167dea02849f3bc8", "balance": { "value": "300000000000000" } @@ -461,11 +461,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe2bb1c95497ab25fab8204f24d2af7e71493d5d8f6f10e973004ef3b779405e", - "value": "305" + "id": "0xffb051b434fa4cbc6862e11dc7aa2d96e3f9f1a4b70fc6f15ba0c14de82c948f", + "value": "218" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } }, @@ -478,11 +478,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe3a07465d39e26c531f30034ccde365447957dd23cbea0039f00e509d34a1eb", - "value": "231" + "id": "0xffbb556992aeb48a80e98d0df29aa55b3338ab1efcf084ce409a6e0a4d8a4133", + "value": "217" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } }, @@ -495,11 +495,11 @@ Response: { }, "contents": { "json": { - "id": "0xff1d853dd07b687cc0ca5640887642ec4475ebbfd6f8e806b64be71e76d5428d", - "value": "350" + "id": "0xffe72a9c6253907066e163b7de7278981648840a9f81321b6f8556c8d545fbce", + "value": "372" }, "type": { - "repr": "0xe39c5511383e8e67b64dcf9647980599d4b35eba5adf0d66e91b7ac98516a7ff::M1::Object" + "repr": "0x0d2a27f669ba2f090cdf8640283601d446a6f047f285e4309bd9d0dd0285b794::M1::Object" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp index 12e70904174..39bc2a17582 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp @@ -25,11 +25,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 3, line 25: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [130, 133, 141, 116, 98, 77, 209, 200, 13, 154, 143, 120, 101, 224, 220, 131, 206, 238, 67, 219, 169, 92, 239, 127, 252, 57, 174, 151, 122, 150, 154, 152, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } -created: object(3,0), object(3,1) -mutated: 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) -deleted: object(_), object(2,0) -gas summary: computation_cost: 1000000, storage_cost: 14789600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [193, 187, 203, 251, 38, 176, 91, 90, 209, 250, 83, 209, 229, 149, 47, 158, 19, 146, 240, 64, 245, 208, 122, 66, 187, 93, 216, 33, 23, 110, 57, 105, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +created: object(3,0) +mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) +deleted: object(2,0) +gas summary: computation_cost: 1000000, storage_cost: 14751600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 4, line 27: //# create-checkpoint @@ -49,11 +49,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 7, line 35: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(6,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [130, 133, 141, 116, 98, 77, 209, 200, 13, 154, 143, 120, 101, 224, 220, 131, 206, 238, 67, 219, 169, 92, 239, 127, 252, 57, 174, 151, 122, 150, 154, 152, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [193, 187, 203, 251, 38, 176, 91, 90, 209, 250, 83, 209, 229, 149, 47, 158, 19, 146, 240, 64, 245, 208, 122, 66, 187, 93, 216, 33, 23, 110, 57, 105, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(7,0) -mutated: 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0), object(3,0) +mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(6,0) -gas summary: computation_cost: 1000000, storage_cost: 14789600, storage_rebate: 14485600, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14751600, storage_rebate: 14447600, non_refundable_storage_fee: 0 task 8, line 37: //# create-checkpoint @@ -64,13 +64,13 @@ task 9, line 39: Epoch advanced: 1 task 10, line 41: -//# view-object 3,1 +//# view-object 3,0 Owner: Account Address ( C ) Version: 3 Contents: iota_system::staking_pool::StakedIota { id: iota::object::UID { id: iota::object::ID { - bytes: fake(3,1), + bytes: fake(3,0), }, }, pool_id: iota::object::ID { @@ -109,13 +109,13 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "IAlPg7XDD4HXzJ8tBoWdIOCk9CHWGLC6skWBLuCO9o7OBAAAAAAAAAA=", + "cursor": "IBDsJZMBCY/eaXIKpCKkv7yoJpJrerTCirswBkePZE7HBAAAAAAAAAA=", "node": { "principal": "10000000000" } }, { - "cursor": "IKI4gAGDZMoQPPhPLcFSlp0iKzRR/wWvUFwIJhRMKXbuBAAAAAAAAAA=", + "cursor": "IN2Ro8PvBnHjp8PjroTpFtRo746i/KBlLfts4VB/JXZ8BAAAAAAAAAA=", "node": { "principal": "10000000000" } @@ -127,15 +127,15 @@ Response: { } task 13, lines 59-103: -//# run-graphql --cursors @{obj_3_1,1} @{obj_7_0,1} +//# run-graphql --cursors @{obj_3_0,1} @{obj_7_0,1} Response: { "data": { - "no_coins_after_obj_3_1_chkpt_1": { + "no_coins_after_obj_3_0_chkpt_1": { "stakedIotas": { "edges": [] } }, - "no_coins_before_obj_3_1_chkpt_1": { + "no_coins_before_obj_3_0_chkpt_1": { "stakedIotas": { "edges": [] } @@ -154,14 +154,14 @@ Response: { } task 14, lines 105-148: -//# run-graphql --cursors @{obj_3_1,3} @{obj_7_0,3} +//# run-graphql --cursors @{obj_3_0,3} @{obj_7_0,3} Response: { "data": { - "coins_after_obj_3_1_chkpt_3": { + "coins_after_obj_3_0_chkpt_3": { "stakedIotas": { "edges": [ { - "cursor": "IKI4gAGDZMoQPPhPLcFSlp0iKzRR/wWvUFwIJhRMKXbuAwAAAAAAAAA=", + "cursor": "IN2Ro8PvBnHjp8PjroTpFtRo746i/KBlLfts4VB/JXZ8AwAAAAAAAAA=", "node": { "principal": "10000000000" } @@ -169,7 +169,7 @@ Response: { ] } }, - "coins_before_obj_3_1_chkpt_3": { + "coins_before_obj_3_0_chkpt_3": { "stakedIotas": { "edges": [] } @@ -183,7 +183,7 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "IAlPg7XDD4HXzJ8tBoWdIOCk9CHWGLC6skWBLuCO9o7OAwAAAAAAAAA=", + "cursor": "IBDsJZMBCY/eaXIKpCKkv7yoJpJrerTCirswBkePZE7HAwAAAAAAAAA=", "node": { "principal": "10000000000" } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.move b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.move index fe21f0554f0..1b3366f414b 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.move +++ b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.move @@ -38,7 +38,7 @@ //# advance-epoch -//# view-object 3,1 +//# view-object 3,0 //# view-object 7,0 @@ -56,11 +56,11 @@ } } -//# run-graphql --cursors @{obj_3_1,1} @{obj_7_0,1} +//# run-graphql --cursors @{obj_3_0,1} @{obj_7_0,1} # Even though there is a stake created after the initial one, the cursor locks the upper bound to # checkpoint 1 - at that point in time, we did not have any additional stakes. { - no_coins_after_obj_3_1_chkpt_1: address(address: "@{C}") { + no_coins_after_obj_3_0_chkpt_1: address(address: "@{C}") { stakedIotas(after: "@{cursor_0}") { edges { cursor @@ -70,7 +70,7 @@ } } } - no_coins_before_obj_3_1_chkpt_1: address(address: "@{C}") { + no_coins_before_obj_3_0_chkpt_1: address(address: "@{C}") { stakedIotas(before: "@{cursor_0}") { edges { cursor @@ -102,11 +102,11 @@ } } -//# run-graphql --cursors @{obj_3_1,3} @{obj_7_0,3} +//# run-graphql --cursors @{obj_3_0,3} @{obj_7_0,3} # The second stake was created at checkpoint 3, and thus will be visible. { - coins_after_obj_3_1_chkpt_3: address(address: "@{C}") { - stakedIotas(after: "@{cursor_0}") { + coins_after_obj_3_0_chkpt_3: address(address: "@{C}") { + stakedIotas(after: "@{cursor_1}") { edges { cursor node { @@ -115,8 +115,8 @@ } } } - coins_before_obj_3_1_chkpt_3: address(address: "@{C}") { - stakedIotas(before: "@{cursor_0}") { + coins_before_obj_3_0_chkpt_3: address(address: "@{C}") { + stakedIotas(before: "@{cursor_1}") { edges { cursor node { @@ -126,7 +126,7 @@ } } coins_after_obj_7_0_chkpt_3: address(address: "@{C}") { - stakedIotas(after: "@{cursor_1}") { + stakedIotas(after: "@{cursor_0}") { edges { cursor node { @@ -136,7 +136,7 @@ } } coins_before_obj_7_0_chkpt_3: address(address: "@{C}") { - stakedIotas(before: "@{cursor_1}") { + stakedIotas(before: "@{cursor_0}") { edges { cursor node { diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp index c6044adfc29..1d02bc0b533 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp @@ -61,66 +61,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -136,66 +136,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -209,66 +209,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -284,7 +284,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", "balance": { "value": "299999993067600" } @@ -306,66 +306,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -390,66 +390,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -463,66 +463,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -538,7 +538,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", "balance": { "value": "300000000000000" } @@ -557,66 +557,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -630,66 +630,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -705,7 +705,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", "balance": { "value": "299999996697200" } @@ -724,66 +724,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -797,66 +797,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -872,7 +872,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", "balance": { "value": "299999993067600" } @@ -907,66 +907,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -982,66 +982,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1055,66 +1055,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1130,7 +1130,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xf1a737372bfe422ee2f122356d521ea5452549b32e2507138bf0eb1be5e20671", + "id": "0x9ff43b8ffd77217a352376c68e9d551ac5ef94c5aedde66a12afd47d286c4b1d", "balance": { "value": "299999993067600" } @@ -1152,66 +1152,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1240,66 +1240,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1313,66 +1313,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1388,66 +1388,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1461,66 +1461,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1536,66 +1536,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } @@ -1609,66 +1609,66 @@ Response: { { "contents": { "json": { - "id": "0x1528ee2827afe061233d5beafd98a2d9b14ad8de57a66bb197a947ccf8b0eb73", - "value": "5" + "id": "0x293c0d141ec1f7369f7faa46b74df004381eaaf38f7ff9ea4f372be2dde70c8e", + "value": "2" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x5eefd87903d53f59556e6587402b29677a34e70c8fcc477225915254ad3627d5", + "id": "0x385ef97aa712cc951145d5e25c44716a543ba38078f1ca7fc140a52845dbaaa5", "value": "3" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0x78ce8e88d32f4c38ff51d7fdc924bf414f6109dedb0a50c1bbc2c774d788c1a7", - "value": "4" + "id": "0x49267a9368ced31be59692f2bf5e844fe968e8371d19bd9f8a785fb7f87c33de", + "value": "200" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xb4e131085768b66cad5635d0d8f7794409d905af175fb3c7188bed9da88e27d4", - "value": "2" + "id": "0x9815ae20b8c097a662696bc0214f7c43f48dff2229d44f2e389b53c032a92489", + "value": "4" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xe8af7d6116139d694d3e18422466fab6955741b933eecb5ee6f7e92433532663", - "value": "200" + "id": "0xb9980fb8881a8e23b6a251e890ce874f7c9d501fd85ceae95697beda07874a07", + "value": "6" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } }, { "contents": { "json": { - "id": "0xfb08f12485f3320b86c0729cf7987ace4a9084ec2b9d839c78165e397a52c18e", - "value": "6" + "id": "0xd1726550d51839c699f7d8dbe77d9604ce4bf418c503c67bc00d05047b0e81cc", + "value": "5" }, "type": { - "repr": "0xea9d9c1b38f75e7505fbd065e100cca5f4be0d196bc22af21c0f854fc20c89fc::M1::Object" + "repr": "0x282f9c2bd1d0262425c2f3cd28f8a1048dfee14c69184a949827392d530c35c5::M1::Object" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp index 37d79d83875..aac09a8bfc8 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp @@ -11,6 +11,6 @@ task 2, lines 10-13: //# run-graphql Response: { "data": { - "chainIdentifier": "e615fa5c" + "chainIdentifier": "5d15b2b9" } } diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp index 65d15c52a98..f457756a3d1 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp @@ -21,11 +21,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, lines 17-19: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [130, 133, 141, 116, 98, 77, 209, 200, 13, 154, 143, 120, 101, 224, 220, 131, 206, 238, 67, 219, 169, 92, 239, 127, 252, 57, 174, 151, 122, 150, 154, 152, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [193, 187, 203, 251, 38, 176, 91, 90, 209, 250, 83, 209, 229, 149, 47, 158, 19, 146, 240, 64, 245, 208, 122, 66, 187, 93, 216, 33, 23, 110, 57, 105, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) -gas summary: computation_cost: 1000000, storage_cost: 14789600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14751600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 5, line 20: //# create-checkpoint @@ -67,11 +67,11 @@ Response: { ] }, "validatorCandidatesSize": 0, - "inactivePoolsId": "0x2b9a58c4ded369560d876639a5b34b3fead568d6598ab604325336d7c7a4d2ed" + "inactivePoolsId": "0xe25b1d52bf33398e4773282d840657ae6612c28d645a3370867cf5c48233a323" }, "totalGasFees": "1000000", "totalStakeRewards": "767000000000000", - "fundSize": "14789600", + "fundSize": "14751600", "fundInflow": "1976000", "fundOutflow": "988000", "netInflow": "988000", @@ -81,7 +81,7 @@ Response: { "kind": { "__typename": "ProgrammableTransactionBlock" }, - "digest": "qWyE8oRrLWndQLguEYQHNLXfp4vZKyGfbXv9ngpww43" + "digest": "9GRJvhfUzg85FAgFLWe3ThjpC8Xdf6qaJWC1NH66TiBg" }, { "kind": { diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp index c3809a76633..a815aec0d1e 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp @@ -21,11 +21,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, line 19: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [226, 199, 155, 126, 61, 210, 185, 124, 180, 187, 173, 186, 177, 130, 230, 105, 249, 133, 233, 67, 137, 200, 120, 18, 222, 157, 32, 43, 79, 77, 0, 198, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [166, 237, 50, 129, 255, 80, 182, 117, 89, 122, 13, 155, 217, 200, 174, 162, 129, 226, 30, 29, 3, 15, 203, 115, 61, 204, 213, 103, 1, 5, 175, 86, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) -gas summary: computation_cost: 1000000, storage_cost: 14789600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14751600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 5, line 21: //# create-checkpoint @@ -61,11 +61,11 @@ Epoch advanced: 3 task 12, line 37: //# run 0x3::iota_system::request_withdraw_stake --args object(0x5) object(4,0) --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [226, 199, 155, 126, 61, 210, 185, 124, 180, 187, 173, 186, 177, 130, 230, 105, 249, 133, 233, 67, 137, 200, 120, 18, 222, 157, 32, 43, 79, 77, 0, 198, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [166, 237, 50, 129, 255, 80, 182, 117, 89, 122, 13, 155, 217, 200, 174, 162, 129, 226, 30, 29, 3, 15, 203, 115, 61, 204, 213, 103, 1, 5, 175, 86, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] } created: object(12,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(4,0) -gas summary: computation_cost: 1000000, storage_cost: 14485600, storage_rebate: 14789600, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14447600, storage_rebate: 14751600, non_refundable_storage_fee: 0 task 13, line 39: //# create-checkpoint @@ -97,9 +97,9 @@ Response: { "data": { "epoch": { "epochId": 4, - "systemStateVersion": 2, + "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "15473600", + "totalObjectStorageRebates": "15435600", "nonRefundableBalance": "0" } } @@ -112,9 +112,9 @@ Response: { "data": { "epoch": { "epochId": 3, - "systemStateVersion": 2, + "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "15777600", + "totalObjectStorageRebates": "15739600", "nonRefundableBalance": "0" } } @@ -127,9 +127,9 @@ Response: { "data": { "epoch": { "epochId": 2, - "systemStateVersion": 2, + "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "14789600", + "totalObjectStorageRebates": "14751600", "nonRefundableBalance": "0" } } @@ -142,9 +142,9 @@ Response: { "data": { "epoch": { "epochId": 1, - "systemStateVersion": 2, + "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "14789600", + "totalObjectStorageRebates": "14751600", "nonRefundableBalance": "0" } } @@ -157,9 +157,9 @@ Response: { "data": { "epoch": { "epochId": 4, - "systemStateVersion": 2, + "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "15473600", + "totalObjectStorageRebates": "15435600", "nonRefundableBalance": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp index d85ebbc9870..c229b501c07 100644 --- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp +++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp @@ -77,67 +77,67 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callU8' (line 30), abort 'ImAU8': 0" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callU8' (line 30), abort 'ImAU8': 0" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callU16' (line 33), abort 'ImAU16': 1" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callU16' (line 33), abort 'ImAU16': 1" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callU32' (line 36), abort 'ImAU32': 2" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callU32' (line 36), abort 'ImAU32': 2" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callU64' (line 39), abort 'ImAU64': 3" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callU64' (line 39), abort 'ImAU64': 3" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callU128' (line 42), abort 'ImAU128': 4" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callU128' (line 42), abort 'ImAU128': 4" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callU256' (line 45), abort 'ImAU256': 5" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callU256' (line 45), abort 'ImAU256': 5" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callString' (line 51), abort 'ImAString': This is a string" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callString' (line 51), abort 'ImAString': This is a string" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA=" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA=" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::normalAbort' (instruction 1), abort code: 0" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::normalAbort' (instruction 1), abort code: 0" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89f3cb0781bdda33a4e9bc5bdb6b3ea62de99f04387bef04eb1b062cceec879c::m::assertLineNo' (line 60)" + "errors": "Error in 1st command, from '0x46d3bbc278a5fafdf4fbeb1f06d431bb3f840921db87cac1c763c3f5df9a885f::m::assertLineNo' (line 60)" } } ] @@ -248,7 +248,7 @@ Response: { }, "errors": [ { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -264,7 +264,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -280,7 +280,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -296,7 +296,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -312,7 +312,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -328,7 +328,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -344,7 +344,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -360,7 +360,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, @@ -376,7 +376,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: a37c9a099e3e82d8b641f22ffa0f3503b9ea10c0374a02cbc32f3c81985b8279", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 4ebcd829293dbdc97d157b5ab7f30ab6ee8082cb8e2c89ab41c734703bfb091b", "locations": [ { "line": 6, diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp index e4c759de58c..8918c9e21cb 100644 --- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp +++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp @@ -37,19 +37,19 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x4e0b6e7e61eb7e1a84ec61887bad7b992ebc3492ad0014bc63281fd1f5acded2::m::t_a' (line 21)" + "errors": "Error in 1st command, from '0xea82e946a882afb6af1a3f7394fbcd0b9acb74ac1850416b2997aea83e9dc3cf::m::t_a' (line 21)" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x4e0b6e7e61eb7e1a84ec61887bad7b992ebc3492ad0014bc63281fd1f5acded2::m::t_calls_a' (line 24)" + "errors": "Error in 1st command, from '0xea82e946a882afb6af1a3f7394fbcd0b9acb74ac1850416b2997aea83e9dc3cf::m::t_calls_a' (line 24)" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x4e0b6e7e61eb7e1a84ec61887bad7b992ebc3492ad0014bc63281fd1f5acded2::m::t_const_assert' (line 10), abort 'EMsg': This is a string" + "errors": "Error in 1st command, from '0xea82e946a882afb6af1a3f7394fbcd0b9acb74ac1850416b2997aea83e9dc3cf::m::t_const_assert' (line 10), abort 'EMsg': This is a string" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp index 93c4aac61f4..1af4042fcd2 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp @@ -62,7 +62,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventA" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -80,7 +80,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventB<0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::Object>" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventB<0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -98,7 +98,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M2::EventA" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M2::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -116,7 +116,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M2::EventB<0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M2::Object>" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M2::EventB<0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M2::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -145,7 +145,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventA" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -163,7 +163,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventB<0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::Object>" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventB<0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -181,7 +181,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M2::EventA" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M2::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -199,7 +199,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M2::EventB<0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M2::Object>" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M2::EventB<0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M2::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -228,7 +228,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventA" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -246,7 +246,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventB<0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::Object>" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventB<0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -275,7 +275,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventA" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -304,7 +304,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::EventB<0x09aacb263274f968c844964d04220221707a91acd5f340c2504f6ee5873c1154::M1::Object>" + "repr": "0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::EventB<0x459fcb1f65c5550a9133232757210fd13717ce6c183b6ef7a82f2b5011264e96::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp index ecdfee877f4..3066037e217 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp @@ -30,7 +30,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0x39f4a482db6935322e3c8144c864bd2c52380b532db8486a87130f6e28feb296::M1::EventA" + "repr": "0xd85259fabc443b9fdc892b86921de5fc3e600583ae8b39688573807c1caa844e::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -56,7 +56,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0x39f4a482db6935322e3c8144c864bd2c52380b532db8486a87130f6e28feb296::M1::EventA" + "repr": "0xd85259fabc443b9fdc892b86921de5fc3e600583ae8b39688573807c1caa844e::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -102,7 +102,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0x39f4a482db6935322e3c8144c864bd2c52380b532db8486a87130f6e28feb296::M1::EventA" + "repr": "0xd85259fabc443b9fdc892b86921de5fc3e600583ae8b39688573807c1caa844e::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp index 8182646915a..a3be7f66825 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp @@ -33,12 +33,12 @@ Response: { "nodes": [ { "json": { - "id": "0xd927e46f8aacf7676813d1cf6fa17ddcb293c07e3f79005f8ef417164e540c36" + "id": "0x8ef24bb978a2740dec618358a5e069eed9cb0573000babfb030fc6a96d005322" } }, { "json": { - "id": "0xd927e46f8aacf7676813d1cf6fa17ddcb293c07e3f79005f8ef417164e540c36", + "id": "0x8ef24bb978a2740dec618358a5e069eed9cb0573000babfb030fc6a96d005322", "version": 1, "fields": { "contents": [ diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp index 423826076e4..71a3400fb15 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp @@ -42,7 +42,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -60,7 +60,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -78,7 +78,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -111,7 +111,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -129,7 +129,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -162,7 +162,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -180,7 +180,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -213,7 +213,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -231,7 +231,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xf33f8064b9a6b148fbadd51f949fa5a4f06575355c6d54e2b6d96cdc10e1e054::M1::EventA" + "repr": "0x8da7dd11aebdf971b65985a60ced8a7c3765a13efe293e43aefe5f0fd508c495::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp index 61ba8e7fea7..531aa5b1bfe 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp @@ -37,19 +37,19 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "64qAV8FFh1QVid2xtt1Xv1jiHVm8kpwYui3jBXDMbfmT" + "digest": "ABGGTqgdfGbSBVgFEX813XXNsF8MdJZWpqMcH2nnSNFm" }, { - "digest": "3QGst81ao9mMLj5vod5dBsbtqHU4B51wdRfhdD9RKvpi" + "digest": "6FrckiGbidr7W3hYRKFEM5fYDf5oLgxAurzZ5WbxD9YE" }, { - "digest": "Dj1eBmi77XMmFs1RBKPqZLrno3iCvRxf4PARoX1VJXv3" + "digest": "53ZoqRMUNA6WMfjB4UPGkZ4NrTV581AUWGmY1YyRWeY4" }, { - "digest": "HTbLMS7bVkTp6GnUSGe9J8WP3fWPqsVwSmKwvf7NjfvU" + "digest": "A7GwxcpBw3ccNz475SmqtzohMun46APiVBAb4DpCNn8C" }, { - "digest": "BT93SR2FLRoghUynybJbTfUtQtfGxc2xPokkp68NPaYY" + "digest": "6UYpWxd35zXVHtrvrJx5wp4VF36vhp8ma4KnqJADvD8K" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp index d97ec9f926e..97e2b959632 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp @@ -30,7 +30,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M1::EventA" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -72,7 +72,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M1::EventA" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -98,7 +98,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M2::EventB" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -124,7 +124,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M1::EventA" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -139,7 +139,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M2::EventB" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -165,7 +165,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M1::EventA" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -180,7 +180,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M2::EventB" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -195,7 +195,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x75c43cbe5f62cbf5675b4f2e38e009c1749a4c0a471be1c087851b22949ca3f6::M2::EventB" + "repr": "0x219aa3cbf9d15f67ecd242302f9534361d309be8db20334950b921200cd78d27::M2::EventB" }, "sender": { "address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp index c7a408bf58f..f60e23fa2c7 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp @@ -38,19 +38,19 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "64qAV8FFh1QVid2xtt1Xv1jiHVm8kpwYui3jBXDMbfmT" + "digest": "ABGGTqgdfGbSBVgFEX813XXNsF8MdJZWpqMcH2nnSNFm" }, { - "digest": "31RzGghRuy1Yk9E9HuhW8sUZvao1Nus2NNzbuRsDrdBq" + "digest": "Fawnz6NSUUbxDfbhEMv3eGw9LThNHso1jqwrHHNBwgC9" }, { - "digest": "4aFosqGULRnVqcwebaRHFtwrJgtL5CNXi5rKMo6qA6wY" + "digest": "4pULgVrUA8S5BCUCfWbARSajjaWXxWG2K4gkm7tQcnxs" }, { - "digest": "2SS6hgkkvST7JvbCRFoUpFDmXyiQvGtRY95tcyvbofwi" + "digest": "8PMknghjk4NC71oxoNReZhWPa9EB8o7DWj7Y2e1F2xBM" }, { - "digest": "HKHfyhCRfTD2pQFsJu292w62q72KX1qjpNyFv5UA9Pp3" + "digest": "5Snnwo69kcStp9Tg7jrgvyqdoet6MSeyznSTV72i63ZP" } ] } @@ -65,7 +65,7 @@ Response: { "nodes": [ { "type": { - "repr": "0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::EventA<0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::T1>" + "repr": "0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::EventA<0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -78,7 +78,7 @@ Response: { }, { "type": { - "repr": "0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::EventA<0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::T2>" + "repr": "0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::EventA<0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::T2>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -91,7 +91,7 @@ Response: { }, { "type": { - "repr": "0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::EventA<0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::T1>" + "repr": "0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::EventA<0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -104,7 +104,7 @@ Response: { }, { "type": { - "repr": "0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::EventA<0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::T2>" + "repr": "0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::EventA<0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::T2>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -128,7 +128,7 @@ Response: { "nodes": [ { "type": { - "repr": "0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::EventA<0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::T1>" + "repr": "0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::EventA<0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -141,7 +141,7 @@ Response: { }, { "type": { - "repr": "0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::EventA<0xd7df10b4bb7d56a722ca7cb40f99f7b06c01612df9394c52e9837ad303879a6c::M1::T1>" + "repr": "0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::EventA<0x3c7d65fe9ed94b351fc1c0c64c7a5a32f8bcc77c1a73ca8ea6df1e38870d9fc8::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp index 1009447ec02..988cb377669 100644 --- a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp +++ b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp @@ -73,7 +73,7 @@ task 5, lines 59-63: //# run-graphql Response: { "data": { - "chainIdentifier": "e615fa5c" + "chainIdentifier": "5d15b2b9" } } @@ -81,7 +81,7 @@ task 6, lines 65-69: //# run-graphql Response: { "data": { - "chainIdentifier": "e615fa5c" + "chainIdentifier": "5d15b2b9" } } diff --git a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp index 1e5a1c28f2f..5efccdea6d9 100644 --- a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp +++ b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp @@ -30,7 +30,7 @@ Response: { "edges": [ { "node": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } } ] @@ -59,7 +59,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } } ] @@ -91,7 +91,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } } ] @@ -100,7 +100,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } } ] @@ -132,7 +132,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } } ] @@ -164,7 +164,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } } ] @@ -190,7 +190,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } } ] @@ -216,7 +216,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS", + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r", "first": null, "last": null } @@ -243,7 +243,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS", + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r", "first": null, "last": null } @@ -270,7 +270,7 @@ Response: { "edges": [ { "txns": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS", + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r", "a": null, "b": null } @@ -324,7 +324,7 @@ Response: { "edges": [ { "node": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS", + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r", "a": null } } @@ -350,14 +350,14 @@ Response: { "fragmentSpread": { "nodes": [ { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } ] }, "inlineFragment": { "nodes": [ { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp index 055598d5209..61aa0f4d4c0 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp @@ -21,7 +21,7 @@ Response: { "iotaCoins": { "edges": [ { - "cursor": "IAR6dDxYD6h5ILuttbDgtzk2uBZtMmg8uWWYSz0yfy30AQAAAAAAAAA=", + "cursor": "IBl9zKoHdhJEpNbtzWE5gkZxFYZO69fthxQnE5X9hvzvAQAAAAAAAAA=", "node": { "coinBalance": "30000000000000000", "contents": { @@ -32,9 +32,9 @@ Response: { } }, { - "cursor": "IDJck2vkh/ozfo2yNE9TyacQ1VGjz+yGyWtAHG70Ix+/AQAAAAAAAAA=", + "cursor": "IC/l+VZYDcKRBWtkMEyb5Ts+u1GEyrFZA0FZGX7A9TOhAQAAAAAAAAA=", "node": { - "coinBalance": "300000000000000", + "coinBalance": "299999983336400", "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" @@ -43,9 +43,9 @@ Response: { } }, { - "cursor": "ID59pxIQJzD+Sx4iYG19+VAtvRP9n4QkEBxw1Qnlp0EXAQAAAAAAAAA=", + "cursor": "IMfBFhrchdL8hoi2Ltzg+5c3ir/vSxuHqFamsjl/tOHKAQAAAAAAAAA=", "node": { - "coinBalance": "299999983336400", + "coinBalance": "300000000000000", "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" @@ -58,34 +58,34 @@ Response: { "fakeCoins": { "edges": [ { - "cursor": "IDyfOdY6mHGcPvrdfs6ZcqA6TD1H01YoKXsmUU0Kyv1EAQAAAAAAAAA=", + "cursor": "IBHB66ZtFCiE6s5NfOXb2IdC6eciac8XqSLHyf+RY3maAQAAAAAAAAA=", "node": { - "coinBalance": "3", + "coinBalance": "1", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x6e23ddb3aa2df9cf76f7d41b8153a5ad872032dd7b1e8606d8b460b5fdb7a0c7::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xa9dae39449ba5bda126f414a0053ca17d6f6fd564ff14013d033c2568e9db1d2::fake::FAKE>" } } } }, { - "cursor": "IEBkEQ2AE72outpEWtiabKPKbSI3RtjZVbJhzu7QqEezAQAAAAAAAAA=", + "cursor": "IMYfYiZF6PCUj0/ELq6LDI7937Yg3hmVH1YMS9+bdXqZAQAAAAAAAAA=", "node": { - "coinBalance": "1", + "coinBalance": "2", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x6e23ddb3aa2df9cf76f7d41b8153a5ad872032dd7b1e8606d8b460b5fdb7a0c7::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xa9dae39449ba5bda126f414a0053ca17d6f6fd564ff14013d033c2568e9db1d2::fake::FAKE>" } } } }, { - "cursor": "IPCmN/m+QXAIxGwQ+o4bOhjkH78+czrLVjlaUPyH+FdDAQAAAAAAAAA=", + "cursor": "IPNrVeqtUf2eaF/q5LJ7kdL4kJpEgePa7Q7C+oMLndZdAQAAAAAAAAA=", "node": { - "coinBalance": "2", + "coinBalance": "3", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x6e23ddb3aa2df9cf76f7d41b8153a5ad872032dd7b1e8606d8b460b5fdb7a0c7::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xa9dae39449ba5bda126f414a0053ca17d6f6fd564ff14013d033c2568e9db1d2::fake::FAKE>" } } } @@ -96,7 +96,7 @@ Response: { "coins": { "edges": [ { - "cursor": "ID59pxIQJzD+Sx4iYG19+VAtvRP9n4QkEBxw1Qnlp0EXAQAAAAAAAAA=", + "cursor": "IC/l+VZYDcKRBWtkMEyb5Ts+u1GEyrFZA0FZGX7A9TOhAQAAAAAAAAA=", "node": { "coinBalance": "299999983336400", "contents": { @@ -121,10 +121,10 @@ Response: { } }, { - "cursor": "eyJ0IjoiMHg2ZTIzZGRiM2FhMmRmOWNmNzZmN2Q0MWI4MTUzYTVhZDg3MjAzMmRkN2IxZTg2MDZkOGI0NjBiNWZkYjdhMGM3OjpmYWtlOjpGQUtFIiwiYyI6MX0", + "cursor": "eyJ0IjoiMHhhOWRhZTM5NDQ5YmE1YmRhMTI2ZjQxNGEwMDUzY2ExN2Q2ZjZmZDU2NGZmMTQwMTNkMDMzYzI1NjhlOWRiMWQyOjpmYWtlOjpGQUtFIiwiYyI6MX0", "node": { "coinType": { - "repr": "0x6e23ddb3aa2df9cf76f7d41b8153a5ad872032dd7b1e8606d8b460b5fdb7a0c7::fake::FAKE" + "repr": "0xa9dae39449ba5bda126f414a0053ca17d6f6fd564ff14013d033c2568e9db1d2::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "6" @@ -142,7 +142,7 @@ Response: { "lastBalance": { "edges": [ { - "cursor": "eyJ0IjoiMHg2ZTIzZGRiM2FhMmRmOWNmNzZmN2Q0MWI4MTUzYTVhZDg3MjAzMmRkN2IxZTg2MDZkOGI0NjBiNWZkYjdhMGM3OjpmYWtlOjpGQUtFIiwiYyI6MX0" + "cursor": "eyJ0IjoiMHhhOWRhZTM5NDQ5YmE1YmRhMTI2ZjQxNGEwMDUzY2ExN2Q2ZjZmZDU2NGZmMTQwMTNkMDMzYzI1NjhlOWRiMWQyOjpmYWtlOjpGQUtFIiwiYyI6MX0" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/data.exp b/crates/iota-graphql-e2e-tests/tests/objects/data.exp index 448e08f36b4..fabbaf7911b 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/data.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/data.exp @@ -36,7 +36,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x93f1f903184fdc131833e33aa92b9cd064d9acf6a6ed6f90fca16acec8eb8008::m::Foo" }, "data": { "Struct": [ @@ -44,111 +44,38 @@ Response: { "name": "id", "value": { "UID": [ - 50, - 92, - 147, - 107, + 89, + 224, + 131, + 254, + 78, 228, - 135, - 250, - 51, - 126, - 141, - 178, - 52, - 79, - 83, - 201, - 167, - 16, - 213, - 81, + 220, + 20, 163, - 207, - 236, - 134, - 201, - 107, - 64, - 28, - 110, - 244, - 35, - 31, - 191 - ] - } - }, - { - "name": "balance", - "value": { - "Struct": [ - { - "name": "value", - "value": { - "Number": "299999988454400" - } - } - ] - } - } - ] - }, - "json": { - "id": "0x325c936be487fa337e8db2344f53c9a710d551a3cfec86c96b401c6ef4231fbf", - "balance": { - "value": "299999988454400" - } - } - } - } - } - }, - { - "outputState": { - "asMoveObject": { - "contents": { - "type": { - "repr": "0xad9af700b6fec32a21f96329c38425a163c987e2ebaf774bcebc71a07616e51c::m::Foo" - }, - "data": { - "Struct": [ - { - "name": "id", - "value": { - "UID": [ - 188, - 171, - 174, - 254, - 182, - 16, + 217, + 75, + 228, + 85, + 115, + 225, + 178, + 192, + 186, + 68, + 57, + 197, + 183, 189, - 18, - 146, - 245, - 165, - 177, - 194, - 195, - 203, - 74, - 172, - 54, - 160, - 1, - 207, - 103, - 6, - 105, - 252, - 252, - 8, - 100, - 42, - 83, - 239, - 226 + 34, + 205, + 192, + 45, + 217, + 39, + 154, + 233, + 58 ] } }, @@ -156,38 +83,38 @@ Response: { "name": "f0", "value": { "ID": [ - 188, - 171, - 174, + 89, + 224, + 131, 254, - 182, - 16, + 78, + 228, + 220, + 20, + 163, + 217, + 75, + 228, + 85, + 115, + 225, + 178, + 192, + 186, + 68, + 57, + 197, + 183, 189, - 18, - 146, - 245, - 165, - 177, - 194, - 195, - 203, - 74, - 172, - 54, - 160, - 1, - 207, - 103, - 6, - 105, - 252, - 252, - 8, - 100, - 42, - 83, - 239, - 226 + 34, + 205, + 192, + 45, + 217, + 39, + 154, + 233, + 58 ] } }, @@ -227,38 +154,38 @@ Response: { "Vector": [ { "Address": [ - 188, - 171, - 174, + 89, + 224, + 131, 254, - 182, - 16, + 78, + 228, + 220, + 20, + 163, + 217, + 75, + 228, + 85, + 115, + 225, + 178, + 192, + 186, + 68, + 57, + 197, + 183, 189, - 18, - 146, - 245, - 165, - 177, - 194, - 195, - 203, - 74, - 172, - 54, - 160, - 1, - 207, - 103, - 6, - 105, - 252, - 252, - 8, - 100, - 42, - 83, - 239, - 226 + 34, + 205, + 192, + 45, + 217, + 39, + 154, + 233, + 58 ] } ] @@ -275,21 +202,94 @@ Response: { ] }, "json": { - "id": "0xbcabaefeb610bd1292f5a5b1c2c3cb4aac36a001cf670669fcfc08642a53efe2", - "f0": "0xbcabaefeb610bd1292f5a5b1c2c3cb4aac36a001cf670669fcfc08642a53efe2", + "id": "0x59e083fe4ee4dc14a3d94be45573e1b2c0ba4439c5b7bd22cdc02dd9279ae93a", + "f0": "0x59e083fe4ee4dc14a3d94be45573e1b2c0ba4439c5b7bd22cdc02dd9279ae93a", "f1": true, "f2": 42, "f3": "43", "f4": "hello", "f5": "world", "f6": [ - "0xbcabaefeb610bd1292f5a5b1c2c3cb4aac36a001cf670669fcfc08642a53efe2" + "0x59e083fe4ee4dc14a3d94be45573e1b2c0ba4439c5b7bd22cdc02dd9279ae93a" ], "f7": 44 } } } } + }, + { + "outputState": { + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + }, + "data": { + "Struct": [ + { + "name": "id", + "value": { + "UID": [ + 199, + 193, + 22, + 26, + 220, + 133, + 210, + 252, + 134, + 136, + 182, + 46, + 220, + 224, + 251, + 151, + 55, + 138, + 191, + 239, + 75, + 27, + 135, + 168, + 86, + 166, + 178, + 57, + 127, + 180, + 225, + 202 + ] + } + }, + { + "name": "balance", + "value": { + "Struct": [ + { + "name": "value", + "value": { + "Number": "299999988454400" + } + } + ] + } + } + ] + }, + "json": { + "id": "0xc7c1161adc85d2fc8688b62edce0fb97378abfef4b1b87a856a6b2397fb4e1ca", + "balance": { + "value": "299999988454400" + } + } + } + } + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/display.exp b/crates/iota-graphql-e2e-tests/tests/objects/display.exp index 82fcf02bbab..94e6c17c433 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/display.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/display.exp @@ -5,7 +5,7 @@ A: object(0,0) task 1, lines 7-131: //# publish --sender A -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [231, 14, 145, 215, 236, 115, 150, 99, 104, 253, 164, 74, 109, 232, 227, 53, 111, 191, 150, 225, 3, 190, 194, 196, 139, 17, 10, 104, 177, 185, 76, 81] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [132, 42, 80, 36, 199, 72, 143, 5, 167, 133, 95, 171, 210, 166, 78, 246, 30, 148, 99, 70, 39, 42, 235, 237, 175, 226, 116, 245, 36, 235, 26, 102] } created: object(1,0), object(1,1), object(1,2) mutated: object(0,0) gas summary: computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 @@ -16,7 +16,7 @@ Checkpoint created: 1 task 3, line 135: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 1, content_digest: XQ7YaLCQJsr331nwrcwULzXVwZwd4378yGLEgizmFpm, +CheckpointSummary { epoch: 0, seq: 1, content_digest: EWZTXH9E8E2sU45TEph9q7g6kK7Jq7ex7YGLZtRHo1SP, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 }} task 4, line 137: @@ -27,7 +27,7 @@ gas summary: computation_cost: 1000000, storage_cost: 3556800, storage_rebate: task 5, line 139: //# run Test::boars::update_display_faulty --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [231, 14, 145, 215, 236, 115, 150, 99, 104, 253, 164, 74, 109, 232, 227, 53, 111, 191, 150, 225, 3, 190, 194, 196, 139, 17, 10, 104, 177, 185, 76, 81, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [132, 42, 80, 36, 199, 72, 143, 5, 167, 133, 95, 171, 210, 166, 78, 246, 30, 148, 99, 70, 39, 42, 235, 237, 175, 226, 116, 245, 36, 235, 26, 102, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 2941200, storage_rebate: 2652400, non_refundable_storage_fee: 0 @@ -37,7 +37,7 @@ Checkpoint created: 2 task 7, line 143: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 2, content_digest: 7pnc2wxspxEHdNrViFdrVbsMJJmUssAexJxfKP3tujQH, +CheckpointSummary { epoch: 0, seq: 2, content_digest: 9acioHwBA96sELJ2AR2BNvPvZ5aks5ntGDKAqzPwhsBY, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 3000000, storage_cost: 27968000, storage_rebate: 3640400, non_refundable_storage_fee: 0 }} task 8, lines 145-158: @@ -74,7 +74,7 @@ Response: { task 9, line 160: //# run Test::boars::single_add --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [231, 14, 145, 215, 236, 115, 150, 99, 104, 253, 164, 74, 109, 232, 227, 53, 111, 191, 150, 225, 3, 190, 194, 196, 139, 17, 10, 104, 177, 185, 76, 81, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [132, 42, 80, 36, 199, 72, 143, 5, 167, 133, 95, 171, 210, 166, 78, 246, 30, 148, 99, 70, 39, 42, 235, 237, 175, 226, 116, 245, 36, 235, 26, 102, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 3032400, storage_rebate: 2941200, non_refundable_storage_fee: 0 @@ -84,7 +84,7 @@ Checkpoint created: 3 task 11, line 164: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 3, content_digest: FJKRQpNmaiiFDAvpXf23QAb6iZhXxFBvyXHADShitDdz, +CheckpointSummary { epoch: 0, seq: 3, content_digest: 48qto52CGbebr3qCSSeqAbegQbcAA9gnwTgyeGnsbUYG, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 4000000, storage_cost: 31000400, storage_rebate: 6581600, non_refundable_storage_fee: 0 }} task 12, lines 166-179: @@ -126,7 +126,7 @@ Response: { task 13, line 181: //# run Test::boars::multi_add --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [231, 14, 145, 215, 236, 115, 150, 99, 104, 253, 164, 74, 109, 232, 227, 53, 111, 191, 150, 225, 3, 190, 194, 196, 139, 17, 10, 104, 177, 185, 76, 81, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [132, 42, 80, 36, 199, 72, 143, 5, 167, 133, 95, 171, 210, 166, 78, 246, 30, 148, 99, 70, 39, 42, 235, 237, 175, 226, 116, 245, 36, 235, 26, 102, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 5236400, storage_rebate: 3032400, non_refundable_storage_fee: 0 @@ -136,7 +136,7 @@ Checkpoint created: 4 task 15, line 185: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 4, content_digest: BkA15aMmLWcoJK5T8PnLGtjUrGcnQKvFD6BmhtaFAkVx, +CheckpointSummary { epoch: 0, seq: 4, content_digest: 7pfXSjG2nHMRZqZfQFjjj1V6hBY5ZYsBQsvq8tqUrm3T, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 5000000, storage_cost: 36236800, storage_rebate: 9614000, non_refundable_storage_fee: 0 }} task 16, lines 187-200: @@ -195,7 +195,7 @@ Response: { }, { "key": "project_url", - "value": "Unique Boar from the Boars collection with First Boar and 0x936b9c5ab4c5d8aba0a64b8af006296b72519444fd64d3cf61dcefa4a423a335", + "value": "Unique Boar from the Boars collection with First Boar and 0xc94f6e8771210785ec6b4e904c8f40ef26991560f5cd6cbb29490eafb1eb133f", "error": null }, { diff --git a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp index 878424d752a..6b4fe5911cc 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp @@ -36,7 +36,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x45219e709abbafc5bfd86a4fbb570b3ececd632133502ba4dd561f05415c5c1b::m::Foo" }, "data": { "Struct": [ @@ -44,111 +44,38 @@ Response: { "name": "id", "value": { "UID": [ - 50, - 92, - 147, - 107, - 228, + 75, + 161, + 40, + 133, + 189, + 95, + 182, + 137, + 220, + 177, + 246, 135, - 250, - 51, - 126, - 141, - 178, - 52, - 79, - 83, - 201, - 167, - 16, - 213, - 81, - 163, - 207, - 236, - 134, - 201, - 107, - 64, - 28, - 110, - 244, - 35, - 31, - 191 - ] - } - }, - { - "name": "balance", - "value": { - "Struct": [ - { - "name": "value", - "value": { - "Number": "299999995967600" - } - } - ] - } - } - ] - }, - "json": { - "id": "0x325c936be487fa337e8db2344f53c9a710d551a3cfec86c96b401c6ef4231fbf", - "balance": { - "value": "299999995967600" - } - } - } - } - } - }, - { - "outputState": { - "asMoveObject": { - "contents": { - "type": { - "repr": "0xc5f5b24b7d768e043a955eaf03f4dcb1b688c147d74cb8e947db8d26996c00f8::m::Foo" - }, - "data": { - "Struct": [ - { - "name": "id", - "value": { - "UID": [ - 208, - 212, - 64, - 221, - 218, - 239, - 14, - 234, - 181, - 211, - 165, - 150, - 57, + 65, + 38, + 42, + 224, + 136, + 147, + 179, + 1, + 12, 235, + 111, 56, - 214, - 114, - 209, - 118, - 28, - 254, - 179, - 127, - 231, - 142, - 118, - 162, - 158, - 232, - 23, - 159, - 44 + 121, + 248, + 149, + 46, + 237, + 59, + 69, + 68 ] } }, @@ -156,38 +83,38 @@ Response: { "name": "f0", "value": { "ID": [ - 208, - 212, - 64, - 221, - 218, - 239, - 14, - 234, - 181, - 211, - 165, - 150, - 57, + 75, + 161, + 40, + 133, + 189, + 95, + 182, + 137, + 220, + 177, + 246, + 135, + 65, + 38, + 42, + 224, + 136, + 147, + 179, + 1, + 12, 235, + 111, 56, - 214, - 114, - 209, - 118, - 28, - 254, - 179, - 127, - 231, - 142, - 118, - 162, - 158, - 232, - 23, - 159, - 44 + 121, + 248, + 149, + 46, + 237, + 59, + 69, + 68 ] } }, @@ -227,38 +154,38 @@ Response: { "Vector": [ { "Address": [ - 208, - 212, - 64, - 221, - 218, - 239, - 14, - 234, - 181, - 211, - 165, - 150, - 57, + 75, + 161, + 40, + 133, + 189, + 95, + 182, + 137, + 220, + 177, + 246, + 135, + 65, + 38, + 42, + 224, + 136, + 147, + 179, + 1, + 12, 235, + 111, 56, - 214, - 114, - 209, - 118, - 28, - 254, - 179, - 127, - 231, - 142, - 118, - 162, - 158, - 232, - 23, - 159, - 44 + 121, + 248, + 149, + 46, + 237, + 59, + 69, + 68 ] } ] @@ -325,15 +252,15 @@ Response: { ] }, "json": { - "id": "0xd0d440dddaef0eeab5d3a59639eb38d672d1761cfeb37fe78e76a29ee8179f2c", - "f0": "0xd0d440dddaef0eeab5d3a59639eb38d672d1761cfeb37fe78e76a29ee8179f2c", + "id": "0x4ba12885bd5fb689dcb1f68741262ae08893b3010ceb6f3879f8952eed3b4544", + "f0": "0x4ba12885bd5fb689dcb1f68741262ae08893b3010ceb6f3879f8952eed3b4544", "f1": true, "f2": 42, "f3": "43", "f4": "hello", "f5": "world", "f6": [ - "0xd0d440dddaef0eeab5d3a59639eb38d672d1761cfeb37fe78e76a29ee8179f2c" + "0x4ba12885bd5fb689dcb1f68741262ae08893b3010ceb6f3879f8952eed3b4544" ], "f7": 44, "f8": { @@ -356,6 +283,79 @@ Response: { } } } + }, + { + "outputState": { + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + }, + "data": { + "Struct": [ + { + "name": "id", + "value": { + "UID": [ + 199, + 193, + 22, + 26, + 220, + 133, + 210, + 252, + 134, + 136, + 182, + 46, + 220, + 224, + 251, + 151, + 55, + 138, + 191, + 239, + 75, + 27, + 135, + 168, + 86, + 166, + 178, + 57, + 127, + 180, + 225, + 202 + ] + } + }, + { + "name": "balance", + "value": { + "Struct": [ + { + "name": "value", + "value": { + "Number": "299999995967600" + } + } + ] + } + } + ] + }, + "json": { + "id": "0xc7c1161adc85d2fc8688b62edce0fb97378abfef4b1b87a856a6b2397fb4e1ca", + "balance": { + "value": "299999995967600" + } + } + } + } + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp index 0ad235dbfb3..cd6ff1d0d68 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp @@ -21,11 +21,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, lines 16-18: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [130, 133, 141, 116, 98, 77, 209, 200, 13, 154, 143, 120, 101, 224, 220, 131, 206, 238, 67, 219, 169, 92, 239, 127, 252, 57, 174, 151, 122, 150, 154, 152, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [193, 187, 203, 251, 38, 176, 91, 90, 209, 250, 83, 209, 229, 149, 47, 158, 19, 146, 240, 64, 245, 208, 122, 66, 187, 93, 216, 33, 23, 110, 57, 105, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) -gas summary: computation_cost: 1000000, storage_cost: 14789600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14751600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 5, line 19: //# create-checkpoint @@ -134,7 +134,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" } } } @@ -145,7 +145,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -156,7 +156,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -167,7 +167,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -178,7 +178,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -189,7 +189,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>" } } } @@ -200,7 +200,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -211,7 +211,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -222,7 +222,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" } } } @@ -233,7 +233,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -244,7 +244,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -255,7 +255,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -288,7 +288,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -299,7 +299,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp index 9daeb809153..451db04f2a8 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp @@ -48,19 +48,19 @@ Response: { "objects": { "edges": [ { - "cursor": "IC/bzuuhYcq/dDN03anRsi3/32D3Lz2sDp3Go1xUI139AQAAAAAAAAA=" + "cursor": "IFy4/XFtcZhBpRR6COeO7ZM8IH7eJcvbW5nlsJedVb+kAQAAAAAAAAA=" }, { - "cursor": "IHgz7SAqJIx5CuF8FKW/t0hYwpueN0FpmlBf65mR8obxAQAAAAAAAAA=" + "cursor": "IK9P5kG5iygq/7pjfX9SipiASf9hfMxiRORO+Bp7D8L3AQAAAAAAAAA=" }, { - "cursor": "IKczlw0wvaV5OAPoLL3J5PdqEVVGHEXwqq76iavO92kKAQAAAAAAAAA=" + "cursor": "IPLRWuZ7QWUTcRib/05Pr3QQPUG4BJKCLzfVN9rpJVdJAQAAAAAAAAA=" }, { - "cursor": "IME4lQAdpoFJFY6JJKEMiyoqyM4bYbW+Vn57w89eGdIKAQAAAAAAAAA=" + "cursor": "IPMz9K/aZDxp+5jua7txJYdapWQenLt0/ZypbgTUc83QAQAAAAAAAAA=" }, { - "cursor": "IMSF21C/sUQyD5+lCFeV8iyy0wujkwLCS27LjKrl9o4WAQAAAAAAAAA=" + "cursor": "IPf+nC8ZOhJUenELE36x/hfy6CIZ0NcojMI5uXE6KMVxAQAAAAAAAAA=" } ] } @@ -76,10 +76,10 @@ Response: { "objects": { "edges": [ { - "cursor": "IC/bzuuhYcq/dDN03anRsi3/32D3Lz2sDp3Go1xUI139AQAAAAAAAAA=" + "cursor": "IFy4/XFtcZhBpRR6COeO7ZM8IH7eJcvbW5nlsJedVb+kAQAAAAAAAAA=" }, { - "cursor": "IHgz7SAqJIx5CuF8FKW/t0hYwpueN0FpmlBf65mR8obxAQAAAAAAAAA=" + "cursor": "IK9P5kG5iygq/7pjfX9SipiASf9hfMxiRORO+Bp7D8L3AQAAAAAAAAA=" } ] } @@ -95,52 +95,52 @@ Response: { "objects": { "edges": [ { - "cursor": "IC/bzuuhYcq/dDN03anRsi3/32D3Lz2sDp3Go1xUI139AQAAAAAAAAA=", + "cursor": "IFy4/XFtcZhBpRR6COeO7ZM8IH7eJcvbW5nlsJedVb+kAQAAAAAAAAA=", "node": { - "address": "0x2fdbceeba161cabf743374dda9d1b22dffdf60f72f3dac0e9dc6a35c54235dfd" + "address": "0x5cb8fd716d719841a5147a08e78eed933c207ede25cbdb5b99e5b0979d55bfa4" } }, { - "cursor": "IHgz7SAqJIx5CuF8FKW/t0hYwpueN0FpmlBf65mR8obxAQAAAAAAAAA=", + "cursor": "IK9P5kG5iygq/7pjfX9SipiASf9hfMxiRORO+Bp7D8L3AQAAAAAAAAA=", "node": { - "address": "0x7833ed202a248c790ae17c14a5bfb74858c29b9e3741699a505feb9991f286f1" + "address": "0xaf4fe641b98b282affba637d7f528a988049ff617ccc6244e44ef81a7b0fc2f7" } }, { - "cursor": "IKczlw0wvaV5OAPoLL3J5PdqEVVGHEXwqq76iavO92kKAQAAAAAAAAA=", + "cursor": "IPLRWuZ7QWUTcRib/05Pr3QQPUG4BJKCLzfVN9rpJVdJAQAAAAAAAAA=", "node": { - "address": "0xa733970d30bda5793803e82cbdc9e4f76a1155461c45f0aaaefa89abcef7690a" + "address": "0xf2d15ae67b41651371189bff4e4faf74103d41b80492822f37d537dae9255749" } }, { - "cursor": "IME4lQAdpoFJFY6JJKEMiyoqyM4bYbW+Vn57w89eGdIKAQAAAAAAAAA=", + "cursor": "IPMz9K/aZDxp+5jua7txJYdapWQenLt0/ZypbgTUc83QAQAAAAAAAAA=", "node": { - "address": "0xc13895001da68149158e8924a10c8b2a2ac8ce1b61b5be567e7bc3cf5e19d20a" + "address": "0xf333f4afda643c69fb98ee6bbb7125875aa5641e9cbb74fd9ca96e04d473cdd0" } }, { - "cursor": "IMSF21C/sUQyD5+lCFeV8iyy0wujkwLCS27LjKrl9o4WAQAAAAAAAAA=", + "cursor": "IPf+nC8ZOhJUenELE36x/hfy6CIZ0NcojMI5uXE6KMVxAQAAAAAAAAA=", "node": { - "address": "0xc485db50bfb144320f9fa5085795f22cb2d30ba39302c24b6ecb8caae5f68e16" + "address": "0xf7fe9c2f193a12547a710b137eb1fe17f2e82219d0d7288cc239b9713a28c571" } } ] } }, "obj_3_0": { - "address": "0xa733970d30bda5793803e82cbdc9e4f76a1155461c45f0aaaefa89abcef7690a" + "address": "0xf7fe9c2f193a12547a710b137eb1fe17f2e82219d0d7288cc239b9713a28c571" }, "obj_5_0": { - "address": "0xc485db50bfb144320f9fa5085795f22cb2d30ba39302c24b6ecb8caae5f68e16" + "address": "0x5cb8fd716d719841a5147a08e78eed933c207ede25cbdb5b99e5b0979d55bfa4" }, "obj_6_0": { - "address": "0x7833ed202a248c790ae17c14a5bfb74858c29b9e3741699a505feb9991f286f1" + "address": "0xf2d15ae67b41651371189bff4e4faf74103d41b80492822f37d537dae9255749" }, "obj_4_0": { - "address": "0xc13895001da68149158e8924a10c8b2a2ac8ce1b61b5be567e7bc3cf5e19d20a" + "address": "0xaf4fe641b98b282affba637d7f528a988049ff617ccc6244e44ef81a7b0fc2f7" }, "obj_2_0": { - "address": "0x2fdbceeba161cabf743374dda9d1b22dffdf60f72f3dac0e9dc6a35c54235dfd" + "address": "0xf333f4afda643c69fb98ee6bbb7125875aa5641e9cbb74fd9ca96e04d473cdd0" } } } @@ -151,7 +151,14 @@ Response: { "data": { "address": { "objects": { - "edges": [] + "edges": [ + { + "cursor": "IK9P5kG5iygq/7pjfX9SipiASf9hfMxiRORO+Bp7D8L3AQAAAAAAAAA=" + }, + { + "cursor": "IPLRWuZ7QWUTcRib/05Pr3QQPUG4BJKCLzfVN9rpJVdJAQAAAAAAAAA=" + } + ] } } } @@ -165,7 +172,7 @@ Response: { "objects": { "edges": [ { - "cursor": "IMSF21C/sUQyD5+lCFeV8iyy0wujkwLCS27LjKrl9o4WAQAAAAAAAAA=" + "cursor": "IPLRWuZ7QWUTcRib/05Pr3QQPUG4BJKCLzfVN9rpJVdJAQAAAAAAAAA=" } ] } @@ -181,10 +188,10 @@ Response: { "objects": { "edges": [ { - "cursor": "IC/bzuuhYcq/dDN03anRsi3/32D3Lz2sDp3Go1xUI139AQAAAAAAAAA=" + "cursor": "IPLRWuZ7QWUTcRib/05Pr3QQPUG4BJKCLzfVN9rpJVdJAQAAAAAAAAA=" }, { - "cursor": "IHgz7SAqJIx5CuF8FKW/t0hYwpueN0FpmlBf65mR8obxAQAAAAAAAAA=" + "cursor": "IPMz9K/aZDxp+5jua7txJYdapWQenLt0/ZypbgTUc83QAQAAAAAAAAA=" } ] } @@ -200,15 +207,15 @@ Response: { "objects": { "edges": [ { - "cursor": "IME4lQAdpoFJFY6JJKEMiyoqyM4bYbW+Vn57w89eGdIKAQAAAAAAAAA=", + "cursor": "IPMz9K/aZDxp+5jua7txJYdapWQenLt0/ZypbgTUc83QAQAAAAAAAAA=", "node": { - "address": "0xc13895001da68149158e8924a10c8b2a2ac8ce1b61b5be567e7bc3cf5e19d20a" + "address": "0xf333f4afda643c69fb98ee6bbb7125875aa5641e9cbb74fd9ca96e04d473cdd0" } }, { - "cursor": "IMSF21C/sUQyD5+lCFeV8iyy0wujkwLCS27LjKrl9o4WAQAAAAAAAAA=", + "cursor": "IPf+nC8ZOhJUenELE36x/hfy6CIZ0NcojMI5uXE6KMVxAQAAAAAAAAA=", "node": { - "address": "0xc485db50bfb144320f9fa5085795f22cb2d30ba39302c24b6ecb8caae5f68e16" + "address": "0xf7fe9c2f193a12547a710b137eb1fe17f2e82219d0d7288cc239b9713a28c571" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp index 85829482a14..f8df96c1dd6 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp @@ -37,10 +37,10 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0xf20b090301ab61ceb34be16da44ff8e09152d5fbdd5fa4d3476dcd00bb62e874::m::Bar" + "repr": "0x8d03a9b1953fb5bebef9d8a63397adaee83a4bafbe596291934f235196363d50::m::Foo" } }, - "hasPublicTransfer": false + "hasPublicTransfer": true } } }, @@ -49,10 +49,10 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x8d03a9b1953fb5bebef9d8a63397adaee83a4bafbe596291934f235196363d50::m::Bar" } }, - "hasPublicTransfer": true + "hasPublicTransfer": false } } }, @@ -61,7 +61,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0xf20b090301ab61ceb34be16da44ff8e09152d5fbdd5fa4d3476dcd00bb62e874::m::Foo" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } }, "hasPublicTransfer": true diff --git a/crates/iota-graphql-e2e-tests/tests/objects/received.exp b/crates/iota-graphql-e2e-tests/tests/objects/received.exp index 0c277d8257c..a7007b50b42 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/received.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/received.exp @@ -30,7 +30,7 @@ Response: { "receivedTransactionBlocks": { "nodes": [ { - "digest": "6N5853NzZGb8qVny7GYYyTV7KHzHeve2EkQN2SNmhWnm" + "digest": "71AAcyeSXUhnafxotwauHjHTVTmEhDo19LpztYCfNT8g" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp index f41146995e5..b2cbb7a43f7 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp @@ -10,7 +10,7 @@ Response: { "objects": { "edges": [ { - "cursor": "INQL0hyC3RWJ7AoHFsaMLF+j7sHWw1uQC2CiOldxPT0yAAAAAAAAAAA=", + "cursor": "IGUksl3PuIlOQcSHjiD+Z1ZSbf87WR78Jm41BDT//QMRAAAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { @@ -39,11 +39,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 3, line 38: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [130, 133, 141, 116, 98, 77, 209, 200, 13, 154, 143, 120, 101, 224, 220, 131, 206, 238, 67, 219, 169, 92, 239, 127, 252, 57, 174, 151, 122, 150, 154, 152, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } -created: object(3,0), object(3,1) -mutated: 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) -deleted: object(_), object(2,0) -gas summary: computation_cost: 1000000, storage_cost: 14789600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [193, 187, 203, 251, 38, 176, 91, 90, 209, 250, 83, 209, 229, 149, 47, 158, 19, 146, 240, 64, 245, 208, 122, 66, 187, 93, 216, 33, 23, 110, 57, 105, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +created: object(3,0) +mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) +deleted: object(2,0) +gas summary: computation_cost: 1000000, storage_cost: 14751600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 4, line 40: //# create-checkpoint @@ -60,34 +60,34 @@ Response: { "objects": { "edges": [ { - "cursor": "IAlPg7XDD4HXzJ8tBoWdIOCk9CHWGLC6skWBLuCO9o7OAgAAAAAAAAA=", + "cursor": "IEgJmpkC8YFkhB9tECDMrtG7k9y4uJNaqAF2geB+z7N8AgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { - "principal": "10000000000", - "poolId": "0x82858d74624dd1c80d9a8f7865e0dc83ceee43dba95cef7ffc39ae977a969a98" + "principal": "15340000000000", + "poolId": "0xc1bbcbfb26b05b5ad1fa53d1e5952f9e1392f040f5d07a42bb5dd821176e3969" } } } }, { - "cursor": "INMoknhK71B8eaQFADCHApV/6LcSSVZh9wpgdTjDKSowAgAAAAAAAAA=", + "cursor": "IGUksl3PuIlOQcSHjiD+Z1ZSbf87WR78Jm41BDT//QMRAgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { - "principal": "15340000000000", - "poolId": "0x82858d74624dd1c80d9a8f7865e0dc83ceee43dba95cef7ffc39ae977a969a98" + "principal": "1500000000000000", + "poolId": "0xc1bbcbfb26b05b5ad1fa53d1e5952f9e1392f040f5d07a42bb5dd821176e3969" } } } }, { - "cursor": "INQL0hyC3RWJ7AoHFsaMLF+j7sHWw1uQC2CiOldxPT0yAgAAAAAAAAA=", + "cursor": "IN2Ro8PvBnHjp8PjroTpFtRo746i/KBlLfts4VB/JXZ8AgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { - "principal": "1500000000000000", - "poolId": "0x82858d74624dd1c80d9a8f7865e0dc83ceee43dba95cef7ffc39ae977a969a98" + "principal": "10000000000", + "poolId": "0xc1bbcbfb26b05b5ad1fa53d1e5952f9e1392f040f5d07a42bb5dd821176e3969" } } } @@ -98,7 +98,7 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "IAlPg7XDD4HXzJ8tBoWdIOCk9CHWGLC6skWBLuCO9o7OAgAAAAAAAAA=", + "cursor": "IN2Ro8PvBnHjp8PjroTpFtRo746i/KBlLfts4VB/JXZ8AgAAAAAAAAA=", "node": { "principal": "10000000000" } diff --git a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp index 372b2ca604d..b9056917fa3 100644 --- a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp +++ b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp @@ -24,7 +24,7 @@ Response: { }, "coin": { "asObject": { - "digest": "FUMdC1RJBNi9WNLyQJmYSegNAyJzEEnN9Jc73XjHEBqk" + "digest": "HU4ujpmsSUJM9zxTFhSzLCBecVZo6erpqdJhCh4xjQUQ" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp index 1e55ca6d967..0266fa6b431 100644 --- a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp +++ b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp @@ -124,10 +124,10 @@ Response: { "version": 11, "contents": { "json": { - "id": "0x5068f0c18aa3563e5d80262449a34a47b09496ca653a3d59c2b935c50a641726", + "id": "0xc1114b6eb407a92b7a0b197badbc1823407e9c97633b607268ee5f65b1a2a389", "count": "1", "wrapped": { - "id": "0x1658e2602aa07920100c1adba1ca75454295991e122b7074ab40d25a392ca2eb", + "id": "0xa23f5d74ef5fe24cf1a38ed845299a13a43bfe54ad4b77e655d8c20932ee3171", "count": "1" } } @@ -141,10 +141,10 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x5068f0c18aa3563e5d80262449a34a47b09496ca653a3d59c2b935c50a641726", + "id": "0xc1114b6eb407a92b7a0b197badbc1823407e9c97633b607268ee5f65b1a2a389", "count": "1", "wrapped": { - "id": "0x1658e2602aa07920100c1adba1ca75454295991e122b7074ab40d25a392ca2eb", + "id": "0xa23f5d74ef5fe24cf1a38ed845299a13a43bfe54ad4b77e655d8c20932ee3171", "count": "1" } } @@ -158,10 +158,10 @@ Response: { "version": 8, "contents": { "json": { - "id": "0x5068f0c18aa3563e5d80262449a34a47b09496ca653a3d59c2b935c50a641726", + "id": "0xc1114b6eb407a92b7a0b197badbc1823407e9c97633b607268ee5f65b1a2a389", "count": "1", "wrapped": { - "id": "0x1658e2602aa07920100c1adba1ca75454295991e122b7074ab40d25a392ca2eb", + "id": "0xa23f5d74ef5fe24cf1a38ed845299a13a43bfe54ad4b77e655d8c20932ee3171", "count": "0" } } @@ -175,10 +175,10 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x5068f0c18aa3563e5d80262449a34a47b09496ca653a3d59c2b935c50a641726", + "id": "0xc1114b6eb407a92b7a0b197badbc1823407e9c97633b607268ee5f65b1a2a389", "count": "0", "wrapped": { - "id": "0x1658e2602aa07920100c1adba1ca75454295991e122b7074ab40d25a392ca2eb", + "id": "0xa23f5d74ef5fe24cf1a38ed845299a13a43bfe54ad4b77e655d8c20932ee3171", "count": "0" } } @@ -199,7 +199,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x6891acaaaaac846f8083441393290e600639dbe33185a073d9f76e101fdaabad", + "id": "0x99d77391300fa6cc55ffa0b9ff022bf378b5bc3772788cde1abdb9ae49376d32", "count": "0" } } @@ -212,7 +212,7 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x6891acaaaaac846f8083441393290e600639dbe33185a073d9f76e101fdaabad", + "id": "0x99d77391300fa6cc55ffa0b9ff022bf378b5bc3772788cde1abdb9ae49376d32", "count": "1" } } @@ -225,7 +225,7 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x6891acaaaaac846f8083441393290e600639dbe33185a073d9f76e101fdaabad", + "id": "0x99d77391300fa6cc55ffa0b9ff022bf378b5bc3772788cde1abdb9ae49376d32", "count": "1" } } @@ -238,7 +238,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x6891acaaaaac846f8083441393290e600639dbe33185a073d9f76e101fdaabad", + "id": "0x99d77391300fa6cc55ffa0b9ff022bf378b5bc3772788cde1abdb9ae49376d32", "count": "0" } } @@ -251,7 +251,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x6891acaaaaac846f8083441393290e600639dbe33185a073d9f76e101fdaabad", + "id": "0x99d77391300fa6cc55ffa0b9ff022bf378b5bc3772788cde1abdb9ae49376d32", "count": "0" } } @@ -271,7 +271,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x636c71f1134e0301da22c21965f558dd1c8cfd474d60a70dc0a31d408919ddc8", + "id": "0xd6445664256f204eaa3e8783aee17750b97aebee9b8c51a2a9e648c77d12fbf8", "count": "0" } } @@ -284,7 +284,7 @@ Response: { "version": 11, "contents": { "json": { - "id": "0x636c71f1134e0301da22c21965f558dd1c8cfd474d60a70dc0a31d408919ddc8", + "id": "0xd6445664256f204eaa3e8783aee17750b97aebee9b8c51a2a9e648c77d12fbf8", "count": "1" } } @@ -297,7 +297,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x636c71f1134e0301da22c21965f558dd1c8cfd474d60a70dc0a31d408919ddc8", + "id": "0xd6445664256f204eaa3e8783aee17750b97aebee9b8c51a2a9e648c77d12fbf8", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp index 3323245065d..91413a84431 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp @@ -155,7 +155,7 @@ task 5, lines 73-97: Response: { "data": { "object": { - "address": "0xf1c07bd0ab7583d96a3edde759111a1ee40ae70efbf57c1dcd571730e64fc478", + "address": "0x6daf3caec4a7f2d281ec3d67062132e77b82717a36ae1a202ef114c2d8247116", "asMovePackage": { "module": { "datatypes": { @@ -190,7 +190,7 @@ task 6, lines 99-144: Response: { "data": { "object": { - "address": "0xf1c07bd0ab7583d96a3edde759111a1ee40ae70efbf57c1dcd571730e64fc478", + "address": "0x6daf3caec4a7f2d281ec3d67062132e77b82717a36ae1a202ef114c2d8247116", "asMovePackage": { "module": { "datatypes": { diff --git a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp index cfd6ca5596d..6b224c93d78 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp @@ -25,19 +25,13 @@ Response: { "nodes": [ { "outputState": { - "address": "0x0bf53c5e9e1c570293d7a26c02d4b2c78a418b90597ebe11f54c55fd58188a56", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "asMovePackage": null } }, { "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x6272669b448ea7486bc2487f8a12291a02428aa00cb0036ec7aa06c85cfc61a4", + "address": "0x892cda14435bf7c27957fb02816f551c07b5cd08e6fad33d2c0b2079f2d7d128", "asMovePackage": { "module": { "enum": { @@ -93,6 +87,12 @@ Response: { } } } + }, + { + "outputState": { + "address": "0xda8033859c15f6d25e4723db777e013b553bb65067e8e792e13f1df51ed45bcb", + "asMovePackage": null + } } ] } @@ -125,25 +125,25 @@ Response: { "nodes": [ { "outputState": { - "address": "0x0bf53c5e9e1c570293d7a26c02d4b2c78a418b90597ebe11f54c55fd58188a56", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "asMovePackage": null } }, { "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", + "address": "0xda8033859c15f6d25e4723db777e013b553bb65067e8e792e13f1df51ed45bcb", "asMovePackage": null } }, { "outputState": { - "address": "0xf6fa65250492fb5dc1a2c1d7bb9f4fbd225348d6bf286a1623d59d13f7961323", + "address": "0xf6b7e8be46e698c1f75f9a19f96fbd823cf743f457208a4cfe36d8ca4dd27c30", "asMovePackage": { "module": { "s": { "module": { "package": { - "address": "0x6272669b448ea7486bc2487f8a12291a02428aa00cb0036ec7aa06c85cfc61a4" + "address": "0x892cda14435bf7c27957fb02816f551c07b5cd08e6fad33d2c0b2079f2d7d128" } }, "name": "S", @@ -198,7 +198,7 @@ Response: { "t": { "module": { "package": { - "address": "0xf6fa65250492fb5dc1a2c1d7bb9f4fbd225348d6bf286a1623d59d13f7961323" + "address": "0xf6b7e8be46e698c1f75f9a19f96fbd823cf743f457208a4cfe36d8ca4dd27c30" } }, "name": "T", @@ -228,12 +228,12 @@ Response: { { "name": "s", "type": { - "repr": "0x6272669b448ea7486bc2487f8a12291a02428aa00cb0036ec7aa06c85cfc61a4::m::S", + "repr": "0x892cda14435bf7c27957fb02816f551c07b5cd08e6fad33d2c0b2079f2d7d128::m::S", "signature": { "ref": null, "body": { "datatype": { - "package": "0x6272669b448ea7486bc2487f8a12291a02428aa00cb0036ec7aa06c85cfc61a4", + "package": "0x892cda14435bf7c27957fb02816f551c07b5cd08e6fad33d2c0b2079f2d7d128", "module": "m", "type": "S", "typeParameters": [] @@ -267,7 +267,7 @@ Response: { { "name": "t", "type": { - "repr": "0x6272669b448ea7486bc2487f8a12291a02428aa00cb0036ec7aa06c85cfc61a4::m::T<0x6272669b448ea7486bc2487f8a12291a02428aa00cb0036ec7aa06c85cfc61a4::m::S>" + "repr": "0x892cda14435bf7c27957fb02816f551c07b5cd08e6fad33d2c0b2079f2d7d128::m::T<0x892cda14435bf7c27957fb02816f551c07b5cd08e6fad33d2c0b2079f2d7d128::m::S>" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp index b004b4bc7ad..9864ee6ab74 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp @@ -23,6 +23,16 @@ Response: { "effects": { "objectChanges": { "nodes": [ + { + "outputState": { + "asMovePackage": null + } + }, + { + "outputState": { + "asMovePackage": null + } + }, { "outputState": { "asMovePackage": { @@ -96,16 +106,6 @@ Response: { } } } - }, - { - "outputState": { - "asMovePackage": null - } - }, - { - "outputState": { - "asMovePackage": null - } } ] } @@ -128,9 +128,7 @@ Response: { "nodes": [ { "outputState": { - "asMovePackage": { - "module": null - } + "asMovePackage": null } }, { @@ -140,7 +138,9 @@ Response: { }, { "outputState": { - "asMovePackage": null + "asMovePackage": { + "module": null + } } } ] @@ -166,7 +166,7 @@ Response: { "effects", "objectChanges", "nodes", - 0, + 2, "outputState", "asMovePackage", "module", @@ -189,6 +189,16 @@ Response: { "effects": { "objectChanges": { "nodes": [ + { + "outputState": { + "asMovePackage": null + } + }, + { + "outputState": { + "asMovePackage": null + } + }, { "outputState": { "asMovePackage": { @@ -264,16 +274,6 @@ Response: { } } } - }, - { - "outputState": { - "asMovePackage": null - } - }, - { - "outputState": { - "asMovePackage": null - } } ] } @@ -304,16 +304,6 @@ Response: { "effects": { "objectChanges": { "nodes": [ - { - "outputState": { - "asMovePackage": null - } - }, - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -349,6 +339,16 @@ Response: { } } } + }, + { + "outputState": { + "asMovePackage": null + } + }, + { + "outputState": { + "asMovePackage": null + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp index fc3ec1af7ba..49c7dbf3bf1 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp @@ -95,19 +95,25 @@ Response: { "nodes": [ { "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "asMovePackage": null } }, { "outputState": { - "address": "0x45df39e2c017840f4dfb5d3f69851692571efea43ae110cd5c87b4606f6f2962", + "address": "0x90da3777304670d639ecc365488681a0979b95465e97d38d27a6d8b39767a50c", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0xacea6c85104624e2f2657398ce48eb094dcb292c5b310b7d5ae8700d01b3d4db", "asMovePackage": { "module": { "function": { "module": { "package": { - "address": "0x45df39e2c017840f4dfb5d3f69851692571efea43ae110cd5c87b4606f6f2962" + "address": "0xacea6c85104624e2f2657398ce48eb094dcb292c5b310b7d5ae8700d01b3d4db" } }, "name": "f", @@ -137,12 +143,6 @@ Response: { } } } - }, - { - "outputState": { - "address": "0x8ad58b6b9e13bb109711a33a2ff3536550ff78be3dfa966d84fe9269bc516281", - "asMovePackage": null - } } ] } @@ -175,25 +175,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "asMovePackage": null } }, { "outputState": { - "address": "0x8ad58b6b9e13bb109711a33a2ff3536550ff78be3dfa966d84fe9269bc516281", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x8af7a745b3856490be3c4a3419ead6572f5f7028316bda953763bafccd7bb853", + "address": "0x7d36195d05e43bce2bec1aefca75579a1470190accd403867683131dcabeffcc", "asMovePackage": { "module": { "f": { "module": { "package": { - "address": "0x8af7a745b3856490be3c4a3419ead6572f5f7028316bda953763bafccd7bb853" + "address": "0x7d36195d05e43bce2bec1aefca75579a1470190accd403867683131dcabeffcc" } }, "name": "f", @@ -223,7 +217,7 @@ Response: { "g": { "module": { "package": { - "address": "0x8af7a745b3856490be3c4a3419ead6572f5f7028316bda953763bafccd7bb853" + "address": "0x7d36195d05e43bce2bec1aefca75579a1470190accd403867683131dcabeffcc" } }, "name": "g", @@ -240,6 +234,12 @@ Response: { } } } + }, + { + "outputState": { + "address": "0x90da3777304670d639ecc365488681a0979b95465e97d38d27a6d8b39767a50c", + "asMovePackage": null + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp index f6622bc7739..b5d01ca088b 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp @@ -22,23 +22,23 @@ Response: { "nodes": [ { "outputState": { - "address": "0x3d0df58ea7563a0a435e386ad08732fd9d186fd45406d0ebc97c6fcb4dab9c31", + "address": "0x18179ce70d45c3c00e68493567ed45c38f3507a8f0b032f924a4a893fae9dbc0", "asMovePackage": { "module": { "name": "m", "package": { - "address": "0x3d0df58ea7563a0a435e386ad08732fd9d186fd45406d0ebc97c6fcb4dab9c31" + "address": "0x18179ce70d45c3c00e68493567ed45c38f3507a8f0b032f924a4a893fae9dbc0" }, "fileFormatVersion": 6, - "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVlPQ31jqdWOgpDXjhq0Icy/Z0Yb9RUBtDryXxvy02rnDEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=", - "disassembly": "// Move bytecode v6\nmodule 3d0df58ea7563a0a435e386ad08732fd9d186fd45406d0ebc97c6fcb4dab9c31.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo(Arg0: u64, Arg1: &Coin): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin)\n\t1: Call coin::value(&Coin): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin)\n\t2: Call foo(u64, &Coin): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin)\n\t5: Call foo(u64, &Coin): u64\n\t6: Mul\n\t7: Ret\n\n}\n}" + "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVlGBec5w1Fw8AOaEk1Z+1Fw481B6jwsDL5JKSok/rp28AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=", + "disassembly": "// Move bytecode v6\nmodule 18179ce70d45c3c00e68493567ed45c38f3507a8f0b032f924a4a893fae9dbc0.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo(Arg0: u64, Arg1: &Coin): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin)\n\t1: Call coin::value(&Coin): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin)\n\t2: Call foo(u64, &Coin): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin)\n\t5: Call foo(u64, &Coin): u64\n\t6: Mul\n\t7: Ret\n\n}\n}" } } } }, { "outputState": { - "address": "0xc5535686aa2907a01a21788ea80f64964405315c9520b508fe7d2d5c89e00773", + "address": "0x18f84f682083f9c9db0f292daef27d31eba97e1e2e533eb3e6c5e155cfaa6d59", "asMovePackage": null } } @@ -63,7 +63,7 @@ Response: { "nodes": [ { "outputState": { - "address": "0x3d0df58ea7563a0a435e386ad08732fd9d186fd45406d0ebc97c6fcb4dab9c31", + "address": "0x18179ce70d45c3c00e68493567ed45c38f3507a8f0b032f924a4a893fae9dbc0", "asMovePackage": { "all": { "edges": [ @@ -136,7 +136,7 @@ Response: { }, { "outputState": { - "address": "0xc5535686aa2907a01a21788ea80f64964405315c9520b508fe7d2d5c89e00773", + "address": "0x18f84f682083f9c9db0f292daef27d31eba97e1e2e533eb3e6c5e155cfaa6d59", "asMovePackage": null } } @@ -161,7 +161,7 @@ Response: { "nodes": [ { "outputState": { - "address": "0x3d0df58ea7563a0a435e386ad08732fd9d186fd45406d0ebc97c6fcb4dab9c31", + "address": "0x18179ce70d45c3c00e68493567ed45c38f3507a8f0b032f924a4a893fae9dbc0", "asMovePackage": { "prefix": { "edges": [ @@ -276,7 +276,7 @@ Response: { }, { "outputState": { - "address": "0xc5535686aa2907a01a21788ea80f64964405315c9520b508fe7d2d5c89e00773", + "address": "0x18f84f682083f9c9db0f292daef27d31eba97e1e2e533eb3e6c5e155cfaa6d59", "asMovePackage": null } } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp index cb1fbc36f98..9fe57b4b121 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp @@ -154,13 +154,13 @@ Response: { "nodes": [ { "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "asMovePackage": null } }, { "outputState": { - "address": "0x627b9b56673e42b32a8e911925d1f509363f09fc10805435d5c158b2334bb0b6", + "address": "0x7ec952beee5417dad3df9d26dc50fa29be30ca08bfdb44b6a31da815c65de817", "asMovePackage": { "module": { "struct": { @@ -189,7 +189,7 @@ Response: { }, { "outputState": { - "address": "0x95cd9a125215d9a9c2f0e7886a58f854bacad26d8112fba1221d32b88812ddc3", + "address": "0xbdccdc4188dcc5ccf549c562edb8e1e3d471f92ee8d4cd80a755fd740da7924c", "asMovePackage": null } } @@ -224,25 +224,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "asMovePackage": null } }, { "outputState": { - "address": "0x95cd9a125215d9a9c2f0e7886a58f854bacad26d8112fba1221d32b88812ddc3", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xa61843baeef134a5c51631e34a1d9e26cc93fe8e3b866b75211a1215c6ab2de0", + "address": "0x7d35feb5a565d1a2d52f405fb31b02ab5e8d8e24782d95bb88d5cf4171165dbb", "asMovePackage": { "module": { "s": { "module": { "package": { - "address": "0x627b9b56673e42b32a8e911925d1f509363f09fc10805435d5c158b2334bb0b6" + "address": "0x7ec952beee5417dad3df9d26dc50fa29be30ca08bfdb44b6a31da815c65de817" } }, "name": "S", @@ -267,7 +261,7 @@ Response: { "t": { "module": { "package": { - "address": "0xa61843baeef134a5c51631e34a1d9e26cc93fe8e3b866b75211a1215c6ab2de0" + "address": "0x7d35feb5a565d1a2d52f405fb31b02ab5e8d8e24782d95bb88d5cf4171165dbb" } }, "name": "T", @@ -294,12 +288,12 @@ Response: { { "name": "s", "type": { - "repr": "0x627b9b56673e42b32a8e911925d1f509363f09fc10805435d5c158b2334bb0b6::m::S", + "repr": "0x7ec952beee5417dad3df9d26dc50fa29be30ca08bfdb44b6a31da815c65de817::m::S", "signature": { "ref": null, "body": { "datatype": { - "package": "0x627b9b56673e42b32a8e911925d1f509363f09fc10805435d5c158b2334bb0b6", + "package": "0x7ec952beee5417dad3df9d26dc50fa29be30ca08bfdb44b6a31da815c65de817", "module": "m", "type": "S", "typeParameters": [] @@ -328,7 +322,7 @@ Response: { { "name": "t", "type": { - "repr": "0x627b9b56673e42b32a8e911925d1f509363f09fc10805435d5c158b2334bb0b6::m::T<0x627b9b56673e42b32a8e911925d1f509363f09fc10805435d5c158b2334bb0b6::m::S>" + "repr": "0x7ec952beee5417dad3df9d26dc50fa29be30ca08bfdb44b6a31da815c65de817::m::T<0x7ec952beee5417dad3df9d26dc50fa29be30ca08bfdb44b6a31da815c65de817::m::S>" } } ] @@ -336,6 +330,12 @@ Response: { } } } + }, + { + "outputState": { + "address": "0xbdccdc4188dcc5ccf549c562edb8e1e3d471f92ee8d4cd80a755fd740da7924c", + "asMovePackage": null + } } ] } @@ -361,11 +361,6 @@ Response: { "asMovePackage": null } }, - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -385,6 +380,11 @@ Response: { } } } + }, + { + "outputState": { + "asMovePackage": null + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/types.exp b/crates/iota-graphql-e2e-tests/tests/packages/types.exp index c871621a795..18bdb2ab6b2 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/types.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/types.exp @@ -275,7 +275,7 @@ Response: { "data": null, "errors": [ { - "message": "Internal error occurred while processing request: Error calculating layout for 0x1131e2744f14320fa60d4672cab8081c5523cd6e19d29249d8bd15186ebb9eb2::m::S1: Type layout nesting exceeded limit of 128", + "message": "Internal error occurred while processing request: Error calculating layout for 0x9409fb9c779fcf6dd2f610d23e191e4f255feecd2324c808d2680a9e40c2ebc2::m::S1: Type layout nesting exceeded limit of 128", "locations": [ { "line": 4, diff --git a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp index 3d02ea6d934..5f082b654b6 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp @@ -31,14 +31,14 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 } ] } }, "firstPackage": { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1, "module": { "functions": { @@ -52,7 +52,7 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 } ] @@ -85,7 +85,7 @@ Response: { "version": 1 }, { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 } ] @@ -124,18 +124,18 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 } ] } }, "firstPackage": { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1, "module": { "functions": { @@ -149,11 +149,11 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 } ] @@ -186,11 +186,11 @@ Response: { "version": 1 }, { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 } ] @@ -232,22 +232,22 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 }, { - "address": "0x6fccb56f16be4cf3185408098f7ff20f23cc341127aa255af3360424cecdef4e", + "address": "0x62257e52471387c714ed25739f98f3edf12dde66fdec2bac930ad436dc30eaef", "version": 3 } ] } }, "firstPackage": { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1, "module": { "functions": { @@ -261,15 +261,15 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 }, { - "address": "0x6fccb56f16be4cf3185408098f7ff20f23cc341127aa255af3360424cecdef4e", + "address": "0x62257e52471387c714ed25739f98f3edf12dde66fdec2bac930ad436dc30eaef", "version": 3 } ] @@ -302,15 +302,15 @@ Response: { "version": 1 }, { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 }, { - "address": "0x6fccb56f16be4cf3185408098f7ff20f23cc341127aa255af3360424cecdef4e", + "address": "0x62257e52471387c714ed25739f98f3edf12dde66fdec2bac930ad436dc30eaef", "version": 3 } ] @@ -738,7 +738,7 @@ Response: { "after": { "nodes": [ { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2, "previousTransactionBlock": { "effects": { @@ -749,7 +749,7 @@ Response: { } }, { - "address": "0x6fccb56f16be4cf3185408098f7ff20f23cc341127aa255af3360424cecdef4e", + "address": "0x62257e52471387c714ed25739f98f3edf12dde66fdec2bac930ad436dc30eaef", "version": 3, "previousTransactionBlock": { "effects": { @@ -764,7 +764,7 @@ Response: { "between": { "nodes": [ { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2, "previousTransactionBlock": { "effects": { @@ -786,15 +786,15 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 }, { - "address": "0x6fccb56f16be4cf3185408098f7ff20f23cc341127aa255af3360424cecdef4e", + "address": "0x62257e52471387c714ed25739f98f3edf12dde66fdec2bac930ad436dc30eaef", "version": 3 } ] @@ -802,11 +802,11 @@ Response: { "after": { "nodes": [ { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 }, { - "address": "0x6fccb56f16be4cf3185408098f7ff20f23cc341127aa255af3360424cecdef4e", + "address": "0x62257e52471387c714ed25739f98f3edf12dde66fdec2bac930ad436dc30eaef", "version": 3 } ] @@ -814,11 +814,11 @@ Response: { "before": { "nodes": [ { - "address": "0xa453b905910869e3ee2006990059311f34a3b6a228b90e5dd46d17eeec3c7887", + "address": "0x569b6ce109b79eba0261f853eca2965eeeb3cdb12eaaa30bbd81b26652caa375", "version": 1 }, { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 } ] @@ -826,7 +826,7 @@ Response: { "between": { "nodes": [ { - "address": "0xe95987bebd20cbc250b28b04ca58b4ad971050ccfb35eb34c2d1ac1f1a8c6008", + "address": "0xa021389a6ec9a9b3fff272fb36e17b17f4dac90c7c9052691b73d229409b29ea", "version": 2 } ] diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp index 18dd50701de..bb75133b233 100644 --- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp +++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp @@ -48,13 +48,13 @@ Response: { "edges": [ { "node": { - "amount": "5000" + "amount": "2000" }, "cursor": "eyJpIjowLCJjIjoyfQ" }, { "node": { - "amount": "2000" + "amount": "5000" }, "cursor": "eyJpIjoxLCJjIjoyfQ" }, @@ -66,19 +66,19 @@ Response: { }, { "node": { - "amount": "1000" + "amount": "4000" }, "cursor": "eyJpIjozLCJjIjoyfQ" }, { "node": { - "amount": "4000" + "amount": "3000" }, "cursor": "eyJpIjo0LCJjIjoyfQ" }, { "node": { - "amount": "3000" + "amount": "1000" }, "cursor": "eyJpIjo1LCJjIjoyfQ" } @@ -111,13 +111,13 @@ Response: { "edges": [ { "node": { - "amount": "1000" + "amount": "4000" }, "cursor": "eyJpIjozLCJjIjoxfQ" }, { "node": { - "amount": "4000" + "amount": "3000" }, "cursor": "eyJpIjo0LCJjIjoxfQ" } @@ -150,13 +150,13 @@ Response: { "edges": [ { "node": { - "amount": "5000" + "amount": "2000" }, "cursor": "eyJpIjowLCJjIjoxfQ" }, { "node": { - "amount": "2000" + "amount": "5000" }, "cursor": "eyJpIjoxLCJjIjoxfQ" }, diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp index 07419711566..cb855e1fcae 100644 --- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp +++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp @@ -65,7 +65,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "G3zJ6KGNDB63vRVbV7qfzzxWXbxkQPXDimUQE484zdk8", + "digest": "6fxo4gGCtmDpC9gqGacd5V4c5a2EkWC3k3wp3dg1Vo1Y", "effects": { "dependencies": { "pageInfo": { @@ -78,7 +78,7 @@ Response: { { "cursor": "eyJpIjowLCJjIjoxfQ", "node": { - "digest": "CWFW8Gbs1FhvtgReQVQGYaYqXAUxVrD3RCiZjxk6Kpww", + "digest": "24ucf5QfxCezcSfitvTokjBZ2qEBva2H3Do65AWvhhjH", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJpIjoxLCJjIjoxfQ", "node": { - "digest": "GKY11WCjiXKjnfZcwyA6mtoqXRpLP7gAEtMrXWLppf2S", + "digest": "7EW2qBG5Kh7saF5WgMwJHXde49NN5JXx4Ev54DmTEqyS", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { @@ -138,7 +138,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "G3zJ6KGNDB63vRVbV7qfzzxWXbxkQPXDimUQE484zdk8", + "digest": "6fxo4gGCtmDpC9gqGacd5V4c5a2EkWC3k3wp3dg1Vo1Y", "effects": { "dependencies": { "pageInfo": { @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJpIjoxLCJjIjoxfQ", "node": { - "digest": "GKY11WCjiXKjnfZcwyA6mtoqXRpLP7gAEtMrXWLppf2S", + "digest": "7EW2qBG5Kh7saF5WgMwJHXde49NN5JXx4Ev54DmTEqyS", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp index 96945c28ea2..f81ebfaef95 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp @@ -30,7 +30,7 @@ Response: { "c0": { "nodes": [ { - "digest": "Gri6dhCH1DX3r3x8mp82QdUEGcbfeUJUkoAMdt9sVcYV", + "digest": "D5tamwocU56oGJ6V1k56CKw2hc5jgnyVZSMh5JmKFPMq", "kind": { "__typename": "GenesisTransaction" } @@ -46,7 +46,7 @@ Response: { } }, { - "digest": "7RpsViKsnLfnT8UfGt6biJ1vg9aM9FTESi6uGZPc75ha", + "digest": "5nMBmvHRhtqd6WgrD3QgxKuHvWqqKaknsvTVk2QiLjQC", "kind": { "__typename": "ProgrammableTransactionBlock" } @@ -87,7 +87,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "Gri6dhCH1DX3r3x8mp82QdUEGcbfeUJUkoAMdt9sVcYV", + "digest": "D5tamwocU56oGJ6V1k56CKw2hc5jgnyVZSMh5JmKFPMq", "kind": { "__typename": "GenesisTransaction" } @@ -105,7 +105,7 @@ Response: { } }, { - "digest": "7RpsViKsnLfnT8UfGt6biJ1vg9aM9FTESi6uGZPc75ha", + "digest": "5nMBmvHRhtqd6WgrD3QgxKuHvWqqKaknsvTVk2QiLjQC", "kind": { "__typename": "ProgrammableTransactionBlock" } @@ -154,7 +154,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "Gri6dhCH1DX3r3x8mp82QdUEGcbfeUJUkoAMdt9sVcYV", + "digest": "D5tamwocU56oGJ6V1k56CKw2hc5jgnyVZSMh5JmKFPMq", "kind": { "__typename": "GenesisTransaction" } @@ -172,7 +172,7 @@ Response: { } }, { - "digest": "7RpsViKsnLfnT8UfGt6biJ1vg9aM9FTESi6uGZPc75ha", + "digest": "5nMBmvHRhtqd6WgrD3QgxKuHvWqqKaknsvTVk2QiLjQC", "kind": { "__typename": "ProgrammableTransactionBlock" } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp index 39a59b66332..8a060770ab6 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp @@ -25,7 +25,7 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0xc2271c0699f0f726463bd4589ca1b5fa100fdab828c91e5636dd3d82c2e1c21b::m::boom' (instruction 1), abort code: 42" + "errors": "Error in 1st command, from '0xb0d7faa009aed85a3669a6db3493dbbb2c59c1ca0ea6f2c31f08bf16b750b92a::m::boom' (instruction 1), abort code: 42" } } ] @@ -54,7 +54,7 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 3rd command, from '0xc2271c0699f0f726463bd4589ca1b5fa100fdab828c91e5636dd3d82c2e1c21b::m::boom' (instruction 1), abort code: 42" + "errors": "Error in 3rd command, from '0xb0d7faa009aed85a3669a6db3493dbbb2c59c1ca0ea6f2c31f08bf16b750b92a::m::boom' (instruction 1), abort code: 42" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp index e65d9c9d1d7..11ee31989b4 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp @@ -60,7 +60,7 @@ Response: { }, "nodes": [ { - "digest": "J1u184aPpB6TgHsfDYc5Tsv94vvfBwkhxCfberHTCFZ1", + "digest": "CEDo4dnYsZLF7rYdJ6zwu6b4hwvjsiD7JTAbiWwrhc3T", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -68,7 +68,7 @@ Response: { } }, { - "digest": "4QwMW1aWPFEzQKYnR4cTJbcKBXj42uek93TooDD5wKuR", + "digest": "9j5N75bkoiNEUwQMcEdtoRUc4kRqueNeGLigL3w1LK8f", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -76,7 +76,7 @@ Response: { } }, { - "digest": "7xh8bTQJC2t71cGLCHi2h12CQ1ECNheTYpmg5nFJ85hV", + "digest": "gbt7gwfXezA6bCHjUsCSvjRaEtwW9p1jD6iyPF8zCLm", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -84,7 +84,7 @@ Response: { } }, { - "digest": "LxveXjHLNrnL1Phg738qQe1B6WRNN9rrqHGWNfwzwoa", + "digest": "EHinCSXyCJSXZt68Q8U4DtcTNxKyNvionH1B4eoBTSZG", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -92,7 +92,7 @@ Response: { } }, { - "digest": "Hv7UJA6pU37uTqwt2MurVJof576haZe4ibst3ALzaDdQ", + "digest": "CMNpkyHmCnCfDvEKp4CuyAiZk9MgsPX6WEhA8LxGoKQw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -117,7 +117,7 @@ Response: { }, "nodes": [ { - "digest": "J1u184aPpB6TgHsfDYc5Tsv94vvfBwkhxCfberHTCFZ1", + "digest": "CEDo4dnYsZLF7rYdJ6zwu6b4hwvjsiD7JTAbiWwrhc3T", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -142,7 +142,7 @@ Response: { }, "nodes": [ { - "digest": "4QwMW1aWPFEzQKYnR4cTJbcKBXj42uek93TooDD5wKuR", + "digest": "9j5N75bkoiNEUwQMcEdtoRUc4kRqueNeGLigL3w1LK8f", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -167,7 +167,7 @@ Response: { }, "nodes": [ { - "digest": "7xh8bTQJC2t71cGLCHi2h12CQ1ECNheTYpmg5nFJ85hV", + "digest": "gbt7gwfXezA6bCHjUsCSvjRaEtwW9p1jD6iyPF8zCLm", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -192,7 +192,7 @@ Response: { }, "nodes": [ { - "digest": "LxveXjHLNrnL1Phg738qQe1B6WRNN9rrqHGWNfwzwoa", + "digest": "EHinCSXyCJSXZt68Q8U4DtcTNxKyNvionH1B4eoBTSZG", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -217,7 +217,7 @@ Response: { }, "nodes": [ { - "digest": "Hv7UJA6pU37uTqwt2MurVJof576haZe4ibst3ALzaDdQ", + "digest": "CMNpkyHmCnCfDvEKp4CuyAiZk9MgsPX6WEhA8LxGoKQw", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp index 829469fcc82..c106450cc34 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp @@ -20,12 +20,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "3DSbRnTPBWwD7etcG4tzp82DC1QN3dbKj2ihxqrou4ai", + "digest": "7QYK3sVyd6aJ2NKcfrQWQY481khSRRo6DrfnxG3Cx2RD", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "AJR8GgePLyr8/ocLmIukc6L7f4FFPcI7ztaeoFzw0m+ZSz9syiNiQS9NzT8PHl8oYlttiegCkIXS+04BLVXf+QZ/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "AP/GBW95TVjDvL9li4Zw97QjZwUC9rIzk56j9yG1rWW6tGgCVX1k/8yroyZ3eGqsyGGynix14eUYyDrw8P4O4wV/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -34,7 +34,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" } ] }, @@ -96,7 +96,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "Gri6dhCH1DX3r3x8mp82QdUEGcbfeUJUkoAMdt9sVcYV" + "digest": "D5tamwocU56oGJ6V1k56CKw2hc5jgnyVZSMh5JmKFPMq" } ] }, @@ -116,37 +116,37 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x3c9eb2ff926a6bdd3668c9952bfea8fcb69b53dd3fcd33f9432c0aec455d39b4", - "idCreated": true, + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x3c9eb2ff926a6bdd3668c9952bfea8fcb69b53dd3fcd33f9432c0aec455d39b4", - "digest": "hjvNjwBMvJDEqq381jeo5mUUv7hJ4L2CiUhh8pU1n3g" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", + "digest": "7JVNy81jaBDxoLBdmjUkfr3AYnWzotCNUXFdkmKNgcAQ" } }, { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "idCreated": false, + "address": "0x905640f2cb32ee3941b7d071d01373ba528aaea1644c56a66073d2c96c1dcce5", + "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "digest": "7ktEAd1EEGTju8ovMi6z2QRPNrHqpQzmiXqJuAUan8wM" + "address": "0x905640f2cb32ee3941b7d071d01373ba528aaea1644c56a66073d2c96c1dcce5", + "digest": "E7YPJyxnnGzZW5D65fVYWEuskcNSsATCFsw3N7zcwAmo" } }, { - "address": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5", + "address": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5", - "digest": "91hMfHEJSq6zhboK6SXk2M6LhKSVwBK4kv72FLiTjGTk" + "address": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e", + "digest": "CXS6vcwxd11azN1tJwMJ9yJWvtocaL8ZHsCR72PVgW2R" } } ] }, "gasEffects": { "gasObject": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" }, "gasSummary": { "computationCost": "1000000", @@ -163,7 +163,7 @@ Response: { "sequenceNumber": 1 }, "transactionBlock": { - "digest": "3DSbRnTPBWwD7etcG4tzp82DC1QN3dbKj2ihxqrou4ai" + "digest": "7QYK3sVyd6aJ2NKcfrQWQY481khSRRo6DrfnxG3Cx2RD" } }, "expiration": null @@ -190,12 +190,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "7MYMRethozwYZxvY9cRyfwPVmf3Uk1XfsFmntQvN6idu", + "digest": "H2FB7qypBGdNrPXfsy6XqbUz1VRc9KhCeUFT4ZqMkQfj", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "APAiPWkYG05kkZWEfH3Yj3FWx8kZyJFRlem0ahCOmlwYyk+QkIPi1mzhhh2hmTxCXbbAzCUUsp2F6D253tzzgwp/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "ANQpPGmATb7BjiHaUhuRVxfsAnrAbzwOCxxbnavNH5OHoCpSLfsUqRiuEJ8Wjty3jO7rBNjF8PP9fAQRdMUbTQ9/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -204,7 +204,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" } ] }, @@ -219,21 +219,21 @@ Response: { "cursor": "eyJpIjowLCJjIjoyfQ", "node": { "__typename": "OwnedOrImmutable", - "address": "0x3c9eb2ff926a6bdd3668c9952bfea8fcb69b53dd3fcd33f9432c0aec455d39b4", + "address": "0x905640f2cb32ee3941b7d071d01373ba528aaea1644c56a66073d2c96c1dcce5", "version": 2, - "digest": "hjvNjwBMvJDEqq381jeo5mUUv7hJ4L2CiUhh8pU1n3g", + "digest": "E7YPJyxnnGzZW5D65fVYWEuskcNSsATCFsw3N7zcwAmo", "object": { - "address": "0x3c9eb2ff926a6bdd3668c9952bfea8fcb69b53dd3fcd33f9432c0aec455d39b4", + "address": "0x905640f2cb32ee3941b7d071d01373ba528aaea1644c56a66073d2c96c1dcce5", "version": 2, - "digest": "hjvNjwBMvJDEqq381jeo5mUUv7hJ4L2CiUhh8pU1n3g", + "digest": "E7YPJyxnnGzZW5D65fVYWEuskcNSsATCFsw3N7zcwAmo", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::package::UpgradeCap" }, "json": { - "id": "0x3c9eb2ff926a6bdd3668c9952bfea8fcb69b53dd3fcd33f9432c0aec455d39b4", - "package": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5", + "id": "0x905640f2cb32ee3941b7d071d01373ba528aaea1644c56a66073d2c96c1dcce5", + "package": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e", "version": "1", "policy": 0 } @@ -315,7 +315,7 @@ Response: { "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002" ], - "currentPackage": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5", + "currentPackage": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e", "upgradeTicket": { "__typename": "Result", "cmd": 0, @@ -367,10 +367,10 @@ Response: { "dependencies": { "nodes": [ { - "digest": "3DSbRnTPBWwD7etcG4tzp82DC1QN3dbKj2ihxqrou4ai" + "digest": "7QYK3sVyd6aJ2NKcfrQWQY481khSRRo6DrfnxG3Cx2RD" }, { - "digest": "Gri6dhCH1DX3r3x8mp82QdUEGcbfeUJUkoAMdt9sVcYV" + "digest": "D5tamwocU56oGJ6V1k56CKw2hc5jgnyVZSMh5JmKFPMq" } ] }, @@ -390,37 +390,37 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x12674f241df607abfadbbc26ad063b3710ac0b583c8f2a65746833fb6c3b7efb", - "idCreated": true, + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x12674f241df607abfadbbc26ad063b3710ac0b583c8f2a65746833fb6c3b7efb", - "digest": "2e39taxAuG7YAejJXu7gCu9MPkjUHQWr9zLkqBEc5e7a" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", + "digest": "BTQLRYqwgXwwL3ndhYDM8oXzVad7bM5VNVFovYathqDm" } }, { - "address": "0x3c9eb2ff926a6bdd3668c9952bfea8fcb69b53dd3fcd33f9432c0aec455d39b4", + "address": "0x905640f2cb32ee3941b7d071d01373ba528aaea1644c56a66073d2c96c1dcce5", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x3c9eb2ff926a6bdd3668c9952bfea8fcb69b53dd3fcd33f9432c0aec455d39b4", - "digest": "FVdtV7B62EG7iRXLeVfNXGAhzmQWEdyRpaqGwGw9La2X" + "address": "0x905640f2cb32ee3941b7d071d01373ba528aaea1644c56a66073d2c96c1dcce5", + "digest": "NPjcYZoApgAxzizvgya78hSHvPZGk4mKUxtnt4BaAq4" } }, { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "idCreated": false, + "address": "0xd262b96c3fcd3830c65cd0e1d61f3ec1a693226a097381bb56e2bb5ec416e2ac", + "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "digest": "FkwF4ASNDEfkAMAZSWo9ex4rjWByhF3chXALZLr3uARX" + "address": "0xd262b96c3fcd3830c65cd0e1d61f3ec1a693226a097381bb56e2bb5ec416e2ac", + "digest": "HQnNaKz2Eo6ZdHGjbG6QzZQQ3fwh2xuqseecdViekTEH" } } ] }, "gasEffects": { "gasObject": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" }, "gasSummary": { "computationCost": "1000000", @@ -437,7 +437,7 @@ Response: { "sequenceNumber": 2 }, "transactionBlock": { - "digest": "7MYMRethozwYZxvY9cRyfwPVmf3Uk1XfsFmntQvN6idu" + "digest": "H2FB7qypBGdNrPXfsy6XqbUz1VRc9KhCeUFT4ZqMkQfj" } }, "expiration": null @@ -482,12 +482,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "12gH87MNnTsGSitFAhkQPefL8HjnXXFfbXwZ2pcyKkr3", + "digest": "CwyouJARqyCpUkWrk5GcabtvjvxQK8FoWEE8RTt8JLAf", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "AOsiUmgbicdOco/MidXQ08Vm4f2Fy4ZjW+Es6vHwaruX8VVpdvSkTd+rq7SHI5imO/4QHD+U2jdmJkklxHOXkwN/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "APbMVZ60aU7GLLL15jJ5mlmg7i0t45HyoUR5hXFEUajavjtkVG7cz9w4KXZvF7igvowK2x/8C6Z5tXrEMv+BPAB/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -496,7 +496,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" } ] }, @@ -591,7 +591,7 @@ Response: { "cursor": "eyJpIjozLCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x12674f241df607abfadbbc26ad063b3710ac0b583c8f2a65746833fb6c3b7efb", + "package": "0xd262b96c3fcd3830c65cd0e1d61f3ec1a693226a097381bb56e2bb5ec416e2ac", "module": "m", "functionName": "new", "typeArguments": [], @@ -615,7 +615,7 @@ Response: { ], "return": [ { - "repr": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5::m::Foo" + "repr": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e::m::Foo" } ] } @@ -642,7 +642,7 @@ Response: { "cursor": "eyJpIjo1LCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x12674f241df607abfadbbc26ad063b3710ac0b583c8f2a65746833fb6c3b7efb", + "package": "0xd262b96c3fcd3830c65cd0e1d61f3ec1a693226a097381bb56e2bb5ec416e2ac", "module": "m", "functionName": "new", "typeArguments": [], @@ -666,7 +666,7 @@ Response: { ], "return": [ { - "repr": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5::m::Foo" + "repr": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e::m::Foo" } ] } @@ -676,7 +676,7 @@ Response: { "cursor": "eyJpIjo2LCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x12674f241df607abfadbbc26ad063b3710ac0b583c8f2a65746833fb6c3b7efb", + "package": "0xd262b96c3fcd3830c65cd0e1d61f3ec1a693226a097381bb56e2bb5ec416e2ac", "module": "m", "functionName": "burn", "typeArguments": [], @@ -692,7 +692,7 @@ Response: { "typeParameters": [], "parameters": [ { - "repr": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5::m::Foo" + "repr": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e::m::Foo" } ], "return": [] @@ -744,10 +744,10 @@ Response: { "dependencies": { "nodes": [ { - "digest": "7HNnodt8V3EkTR7kaxF3aacVdW63Fdh1chbsEt6XBAV5" + "digest": "ABMtBtFZ9avVrn8ivEE9oVStsRxeBnQzzWXQeWNrzQAU" }, { - "digest": "7MYMRethozwYZxvY9cRyfwPVmf3Uk1XfsFmntQvN6idu" + "digest": "H2FB7qypBGdNrPXfsy6XqbUz1VRc9KhCeUFT4ZqMkQfj" } ] }, @@ -767,21 +767,21 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "idCreated": false, + "address": "0x12798a2bf1e548ee9db1d0fb4189f40a914b12f12b908bef47bfa44e95444514", + "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "digest": "BkdYp5ujpqrZjDaUhFUTJibKHe2t8KpNjJ4JHxMrF7zf", + "address": "0x12798a2bf1e548ee9db1d0fb4189f40a914b12f12b908bef47bfa44e95444514", + "digest": "9Bh4jULCxyYHV6sLhDcxTtVnC5ruBkLZ1Bpjyb3MiuQP", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", + "id": "0x12798a2bf1e548ee9db1d0fb4189f40a914b12f12b908bef47bfa44e95444514", "balance": { - "value": "299999982082400" + "value": "2000" } } } @@ -789,21 +789,21 @@ Response: { } }, { - "address": "0x75fb35283c4fed78d4fd79b027a5dc57ecbed1a3ec3935c1ff715a8fb31831c0", - "idCreated": true, + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x75fb35283c4fed78d4fd79b027a5dc57ecbed1a3ec3935c1ff715a8fb31831c0", - "digest": "9Gtiyad2QNJbCN4DknFZP4a7P9WAD8sBJXpCSRpvDm3g", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", + "digest": "CZXk68VBRKFGCskBCKBckyLdvKMzUaCeNA4kqfTFNpp5", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x75fb35283c4fed78d4fd79b027a5dc57ecbed1a3ec3935c1ff715a8fb31831c0", + "id": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "balance": { - "value": "2000" + "value": "299999982082400" } } } @@ -811,19 +811,19 @@ Response: { } }, { - "address": "0xb1e87710acb21b557622803dcd54dbe64a54e4d838414f56f9377c8dfdf30881", + "address": "0x3eaed9da402396fb544411efca4247fdee77ec3e8bb569186f71b2ae7d8d527f", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xb1e87710acb21b557622803dcd54dbe64a54e4d838414f56f9377c8dfdf30881", - "digest": "8sCwLVRxWbhCYqKncJSSCEnPuk8RwXDKF5yTJFnQdhxh", + "address": "0x3eaed9da402396fb544411efca4247fdee77ec3e8bb569186f71b2ae7d8d527f", + "digest": "3EDfpiY6rEZ57NQp5QSBvKTCRf4FqMXCRjKkhTK7rUGL", "asMoveObject": { "contents": { "type": { - "repr": "0xc8d95d34fe5a3c06aa6a2331584f073946b64bcc97dcb163f9fbd9cfc6243ee5::m::Foo" + "repr": "0xa8547906981ade3ff0eba51ba5187b7cea72e0c50555e4043afe6c4b9e56742e::m::Foo" }, "json": { - "id": "0xb1e87710acb21b557622803dcd54dbe64a54e4d838414f56f9377c8dfdf30881", + "id": "0x3eaed9da402396fb544411efca4247fdee77ec3e8bb569186f71b2ae7d8d527f", "xs": [ "42", "43" @@ -837,7 +837,7 @@ Response: { }, "gasEffects": { "gasObject": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" }, "gasSummary": { "computationCost": "1000000", @@ -854,7 +854,7 @@ Response: { "sequenceNumber": 3 }, "transactionBlock": { - "digest": "12gH87MNnTsGSitFAhkQPefL8HjnXXFfbXwZ2pcyKkr3" + "digest": "CwyouJARqyCpUkWrk5GcabtvjvxQK8FoWEE8RTt8JLAf" } }, "expiration": null @@ -881,12 +881,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "DGp3E2onKoJaW4sAyxbAci7FemwYraZxuRD1EJt8Fr8F", + "digest": "DRTbQNR6A4Fyp6XAGP6tSYaVZrL6V5VByCytshgp7Tg7", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "ADDTRR67kqcepxRuN2zrO/X7q6tS0micpLVpGhCC23kIHDqfAbd+QwZzedOyZc89xZKOVyr2FLSqO82H0Ort2gF/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "AI8tWNs/Herxb3fiedMsTMpKT0t8seVElSG1d4CPzVo2hepTo94pZtULuQDLeHUIdFWJbfd3dflpFPgBldKJAwt/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -895,7 +895,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" } ] }, @@ -942,7 +942,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "12gH87MNnTsGSitFAhkQPefL8HjnXXFfbXwZ2pcyKkr3" + "digest": "CwyouJARqyCpUkWrk5GcabtvjvxQK8FoWEE8RTt8JLAf" } ] }, @@ -962,19 +962,19 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117", - "digest": "2n1WdNcSsyZ6EDmFvvkcm6SxEvFnohEyJ9cwuuJFLYBw" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1", + "digest": "2dZMYRYUa1DLwxXwrBE7gLuuYnZjXNL4cCQ8ebtWxmoH" } } ] }, "gasEffects": { "gasObject": { - "address": "0x3e7da712102730fe4b1e22606d7df9502dbd13fd9f8424101c70d509e5a74117" + "address": "0x2fe5f956580dc291056b64304c9be53b3ebb5184cab159034159197ec0f533a1" }, "gasSummary": { "computationCost": "1000000", @@ -991,7 +991,7 @@ Response: { "sequenceNumber": 4 }, "transactionBlock": { - "digest": "DGp3E2onKoJaW4sAyxbAci7FemwYraZxuRD1EJt8Fr8F" + "digest": "DRTbQNR6A4Fyp6XAGP6tSYaVZrL6V5VByCytshgp7Tg7" } }, "expiration": null diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp index 85adccf3c08..f085e309cfa 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp @@ -19,7 +19,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000008", "inner": { - "id": "0x9b0bff650abbfb6f12494e571d931a5d67d633bdcb4cf09c0266d682e9a2670d", + "id": "0x29823d2f1c096f2b9af514ad2d880d004c9c40efd319094f846acf1a701daea1", "version": "1" } } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp index 70e01781bc0..c46dee5b30b 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -124,7 +124,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EL2y9pXhcQ7jdKdhtxiggBDG8L887rZBNyrZ8DLqk1j1", + "digest": "FYcmiwLn8mnCXVnDeP1PPpjyWgtfAugYYNcyimeJvc4v", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -135,7 +135,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "BpHP1cdAfDYy5FpXgd5JY9Cj6p2BqqAbaWNQ4g14Qm8f", + "digest": "BqRT6Fi9kcAgBuvPREMXYsJYbt4fkq21KpzyCq6sZYx4", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -163,7 +163,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EL2y9pXhcQ7jdKdhtxiggBDG8L887rZBNyrZ8DLqk1j1", + "digest": "FYcmiwLn8mnCXVnDeP1PPpjyWgtfAugYYNcyimeJvc4v", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -191,7 +191,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "AQrGU4HkLwDQh2yQsc5vuvx674EhEZRXKibUTEkKKiyh", + "digest": "GyF3qZjgqSD8utk2usN6TYnbRCQhfjv1uvoFeo3EMckQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -219,7 +219,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "BpHP1cdAfDYy5FpXgd5JY9Cj6p2BqqAbaWNQ4g14Qm8f", + "digest": "BqRT6Fi9kcAgBuvPREMXYsJYbt4fkq21KpzyCq6sZYx4", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -230,7 +230,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "AQrGU4HkLwDQh2yQsc5vuvx674EhEZRXKibUTEkKKiyh", + "digest": "GyF3qZjgqSD8utk2usN6TYnbRCQhfjv1uvoFeo3EMckQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -258,7 +258,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "vYpcLTqmt69frK9fCE4rXMkbpkc6apXpSvdBjgk5pyH", + "digest": "7AFJxrqmGYWoFgq43BBtFMT1VSVuUwbtY9kH7tsDKVV1", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -286,7 +286,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "vYpcLTqmt69frK9fCE4rXMkbpkc6apXpSvdBjgk5pyH", + "digest": "7AFJxrqmGYWoFgq43BBtFMT1VSVuUwbtY9kH7tsDKVV1", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp index 51fcb4a904f..93f175393cf 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "6bfFwPs8Hkjc7eaztsXXSKS84ticY27fEL3zq3h6FhSS", + "digest": "AuwYwdQGw2YWRArGLXyQDXCdmwoyzVsaNLEzFCzu5t2R", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -124,7 +124,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "6bfFwPs8Hkjc7eaztsXXSKS84ticY27fEL3zq3h6FhSS", + "digest": "AuwYwdQGw2YWRArGLXyQDXCdmwoyzVsaNLEzFCzu5t2R", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -135,7 +135,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "8upnpxNJkeBDqLwk7zayaVQYANo55oJfZCg1JQwbKsuh", + "digest": "9XBfbnZ5C3pALuWxFRbRaqDETHg5o9m61Z6HQUF2nTCw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -163,7 +163,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "8KCuLqYGLc8tVcbDYZPyv8nUjXRiCFt2PTs5Z8HQAXmt", + "digest": "AdAgcZF4N1nRh9gUw4oWwCafLbtpdac9WCHqFru1wJcJ", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp index 2e4ae90503d..1e67578f056 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "6bfFwPs8Hkjc7eaztsXXSKS84ticY27fEL3zq3h6FhSS", + "digest": "AuwYwdQGw2YWRArGLXyQDXCdmwoyzVsaNLEzFCzu5t2R", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "8upnpxNJkeBDqLwk7zayaVQYANo55oJfZCg1JQwbKsuh", + "digest": "9XBfbnZ5C3pALuWxFRbRaqDETHg5o9m61Z6HQUF2nTCw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "5xBgXz26tENUjcExEDjVutzbvCU8HWwWtB2a7razFr1D", + "digest": "EGU17DT8xE71tHpoUpWL9RVMdMJh8jbgBGRQrQhxPgXa", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "DgudPYaSZbXdypJYSsr9thh9pYvJF22AR78jfYqZG2ej", + "digest": "4qixoaozVeYEQR6RkmVFMnQpQyFCrjCcxkp6Erh4hLp8", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -168,7 +168,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -196,7 +196,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "6bfFwPs8Hkjc7eaztsXXSKS84ticY27fEL3zq3h6FhSS", + "digest": "AuwYwdQGw2YWRArGLXyQDXCdmwoyzVsaNLEzFCzu5t2R", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -224,7 +224,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "8upnpxNJkeBDqLwk7zayaVQYANo55oJfZCg1JQwbKsuh", + "digest": "9XBfbnZ5C3pALuWxFRbRaqDETHg5o9m61Z6HQUF2nTCw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -268,7 +268,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "5xBgXz26tENUjcExEDjVutzbvCU8HWwWtB2a7razFr1D", + "digest": "EGU17DT8xE71tHpoUpWL9RVMdMJh8jbgBGRQrQhxPgXa", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "DgudPYaSZbXdypJYSsr9thh9pYvJF22AR78jfYqZG2ej", + "digest": "4qixoaozVeYEQR6RkmVFMnQpQyFCrjCcxkp6Erh4hLp8", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -333,7 +333,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "5xBgXz26tENUjcExEDjVutzbvCU8HWwWtB2a7razFr1D", + "digest": "EGU17DT8xE71tHpoUpWL9RVMdMJh8jbgBGRQrQhxPgXa", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -344,7 +344,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "DgudPYaSZbXdypJYSsr9thh9pYvJF22AR78jfYqZG2ej", + "digest": "4qixoaozVeYEQR6RkmVFMnQpQyFCrjCcxkp6Erh4hLp8", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp index ed9a0f61b21..390ee732cbe 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "381JoeMBiPrexDn1WJRBgXvL8YLm1YD4WrbTMmhVXn8G", + "digest": "6MzShwo92NJGU6u9RMBzVvbk49dLZikc9Lsxs4aEMezA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "DxABrPfCXkTBM5EpSdjuUSWjz7XfcXQhQrk62iezziaV", + "digest": "D6pbZUP2xpMbA76LjiD7JtgahEaDeCy7XKGz2dCk7R96", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "kUr2QWovVEmFs7E5Gfhh5v3u99HcKS8pEoDFmKuEHYd", + "digest": "DoepHXK2EjwJi8YD3wTnw3PaHqdyNFLAV9RMBwNaArmX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "E3Rn9vkpCiZcJtYFHdAUMbD4RKFNFq9Kpmav2hAnm98f", + "digest": "9U55AQTuHxya8C7Nu53Z3fMEvpsfxtY5fzFXZhyTwPHm", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -168,7 +168,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "E3Rn9vkpCiZcJtYFHdAUMbD4RKFNFq9Kpmav2hAnm98f", + "digest": "9U55AQTuHxya8C7Nu53Z3fMEvpsfxtY5fzFXZhyTwPHm", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -196,7 +196,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "kUr2QWovVEmFs7E5Gfhh5v3u99HcKS8pEoDFmKuEHYd", + "digest": "DoepHXK2EjwJi8YD3wTnw3PaHqdyNFLAV9RMBwNaArmX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -224,7 +224,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "DxABrPfCXkTBM5EpSdjuUSWjz7XfcXQhQrk62iezziaV", + "digest": "D6pbZUP2xpMbA76LjiD7JtgahEaDeCy7XKGz2dCk7R96", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -268,7 +268,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "381JoeMBiPrexDn1WJRBgXvL8YLm1YD4WrbTMmhVXn8G", + "digest": "6MzShwo92NJGU6u9RMBzVvbk49dLZikc9Lsxs4aEMezA", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp index 5742ce26b91..4efcca80b9f 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp @@ -164,7 +164,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -175,7 +175,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "7ZqZsYUVDfoiXP3kUtmxUv69YkJVaQVpw7758rYZrzq9", + "digest": "HjJ5bsVsg1wmSQVaptghpxQnk4pUmCGjBacsCaM4XK3G", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -186,7 +186,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "74qSE5g6oMNsCSCzdqgTzk2EhEZa5Aq7o8zcUh6H3VwP", + "digest": "BQ1PVUmtANuMsBUqYsxDCdjnpNJ2tRpYxDuwtrVEbjS", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -197,7 +197,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxOCwiaSI6ZmFsc2V9", "node": { - "digest": "CiXB5Pmn8uu2swTvV6xGHBbft1pLSxsDvZ9jr6mx7ub", + "digest": "4mrPRVfkpQbpogptpsEA6PumdqxEZLTRy5ueTdxG9rma", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -208,7 +208,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "7PtWxxxvP5sDTm867WHwuyf8ZKKdi67w7S6Q2Tqb8ppU", + "digest": "9R3Zs3jtDNAAJPeSVXjYxZrcGSNGAEnqxBduVySnaeNC", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -236,7 +236,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -264,7 +264,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "7ZqZsYUVDfoiXP3kUtmxUv69YkJVaQVpw7758rYZrzq9", + "digest": "HjJ5bsVsg1wmSQVaptghpxQnk4pUmCGjBacsCaM4XK3G", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -308,7 +308,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "74qSE5g6oMNsCSCzdqgTzk2EhEZa5Aq7o8zcUh6H3VwP", + "digest": "BQ1PVUmtANuMsBUqYsxDCdjnpNJ2tRpYxDuwtrVEbjS", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -336,7 +336,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxOCwiaSI6ZmFsc2V9", "node": { - "digest": "CiXB5Pmn8uu2swTvV6xGHBbft1pLSxsDvZ9jr6mx7ub", + "digest": "4mrPRVfkpQbpogptpsEA6PumdqxEZLTRy5ueTdxG9rma", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -364,7 +364,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "7PtWxxxvP5sDTm867WHwuyf8ZKKdi67w7S6Q2Tqb8ppU", + "digest": "9R3Zs3jtDNAAJPeSVXjYxZrcGSNGAEnqxBduVySnaeNC", "effects": { "checkpoint": { "sequenceNumber": 5 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp index ae4c134ce20..97465c7d79f 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp @@ -164,7 +164,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -175,7 +175,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "7ZqZsYUVDfoiXP3kUtmxUv69YkJVaQVpw7758rYZrzq9", + "digest": "HjJ5bsVsg1wmSQVaptghpxQnk4pUmCGjBacsCaM4XK3G", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -186,7 +186,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "74qSE5g6oMNsCSCzdqgTzk2EhEZa5Aq7o8zcUh6H3VwP", + "digest": "BQ1PVUmtANuMsBUqYsxDCdjnpNJ2tRpYxDuwtrVEbjS", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -197,7 +197,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "HtuUyxc3FEATfG54UmSWPwPKjxp7dVbu5Yqagw1s58s7", + "digest": "khcJ9fEw9D8Bu5t81hi5GSXBxNkU3MdgYiTj9rZ7tQv", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -225,7 +225,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "HtuUyxc3FEATfG54UmSWPwPKjxp7dVbu5Yqagw1s58s7", + "digest": "khcJ9fEw9D8Bu5t81hi5GSXBxNkU3MdgYiTj9rZ7tQv", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -253,7 +253,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "74qSE5g6oMNsCSCzdqgTzk2EhEZa5Aq7o8zcUh6H3VwP", + "digest": "BQ1PVUmtANuMsBUqYsxDCdjnpNJ2tRpYxDuwtrVEbjS", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -313,7 +313,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "7ZqZsYUVDfoiXP3kUtmxUv69YkJVaQVpw7758rYZrzq9", + "digest": "HjJ5bsVsg1wmSQVaptghpxQnk4pUmCGjBacsCaM4XK3G", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -341,7 +341,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp index 0f529337cd9..1916d2030bd 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "21JZwfC2UgQ5FSDrx5KagLzKTvKiyjqb2E9C4CFD3oe6", + "digest": "7372QgebeG75YnW1Nud3eG4eVgLaThjs1TqmyRrFxQjE", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EL2y9pXhcQ7jdKdhtxiggBDG8L887rZBNyrZ8DLqk1j1", + "digest": "FYcmiwLn8mnCXVnDeP1PPpjyWgtfAugYYNcyimeJvc4v", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "9dao66sYWHWsUjwK4kto3f8SUeUjBjEmpRAhadg7isKC", + "digest": "2GwverRVREHB8WwmrY6YnNMJjMJnCKNN59YBRRLydnJs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "BpHP1cdAfDYy5FpXgd5JY9Cj6p2BqqAbaWNQ4g14Qm8f", + "digest": "BqRT6Fi9kcAgBuvPREMXYsJYbt4fkq21KpzyCq6sZYx4", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "3V9KMtrv7DZ31rJ24nwNMbH2ZMadopfYankeb7qi257E", + "digest": "beu57u2iKq1YJqbqJcLPVmr4ivPeufYmyfWpkGPtSVc", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -162,7 +162,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "AQrGU4HkLwDQh2yQsc5vuvx674EhEZRXKibUTEkKKiyh", + "digest": "GyF3qZjgqSD8utk2usN6TYnbRCQhfjv1uvoFeo3EMckQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -173,7 +173,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "EXacrf1BUxBuhqY3LPTqVYujEf9HxP6nunMoHLxN8r4V", + "digest": "3Rq4L2TjmHoP8r9DjeGsSegphs4nZmwpiWWYXT7EjDMf", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -184,7 +184,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "vYpcLTqmt69frK9fCE4rXMkbpkc6apXpSvdBjgk5pyH", + "digest": "7AFJxrqmGYWoFgq43BBtFMT1VSVuUwbtY9kH7tsDKVV1", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -195,7 +195,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "2wv6uo96d6svx9U9h7FeyqfRxm3SWvKLqEW6vZfAcJU4", + "digest": "2P2FY8peWtJpdceEpAeQARHiXo7EUDhbHQhiqdxruRBf", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -223,7 +223,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -251,7 +251,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EL2y9pXhcQ7jdKdhtxiggBDG8L887rZBNyrZ8DLqk1j1", + "digest": "FYcmiwLn8mnCXVnDeP1PPpjyWgtfAugYYNcyimeJvc4v", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "BpHP1cdAfDYy5FpXgd5JY9Cj6p2BqqAbaWNQ4g14Qm8f", + "digest": "BqRT6Fi9kcAgBuvPREMXYsJYbt4fkq21KpzyCq6sZYx4", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -290,7 +290,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "AQrGU4HkLwDQh2yQsc5vuvx674EhEZRXKibUTEkKKiyh", + "digest": "GyF3qZjgqSD8utk2usN6TYnbRCQhfjv1uvoFeo3EMckQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -318,7 +318,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "vYpcLTqmt69frK9fCE4rXMkbpkc6apXpSvdBjgk5pyH", + "digest": "7AFJxrqmGYWoFgq43BBtFMT1VSVuUwbtY9kH7tsDKVV1", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp index 7365a8352db..b4e64e53318 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "21JZwfC2UgQ5FSDrx5KagLzKTvKiyjqb2E9C4CFD3oe6", + "digest": "7372QgebeG75YnW1Nud3eG4eVgLaThjs1TqmyRrFxQjE", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EL2y9pXhcQ7jdKdhtxiggBDG8L887rZBNyrZ8DLqk1j1", + "digest": "FYcmiwLn8mnCXVnDeP1PPpjyWgtfAugYYNcyimeJvc4v", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "9dao66sYWHWsUjwK4kto3f8SUeUjBjEmpRAhadg7isKC", + "digest": "2GwverRVREHB8WwmrY6YnNMJjMJnCKNN59YBRRLydnJs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "BpHP1cdAfDYy5FpXgd5JY9Cj6p2BqqAbaWNQ4g14Qm8f", + "digest": "BqRT6Fi9kcAgBuvPREMXYsJYbt4fkq21KpzyCq6sZYx4", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "3V9KMtrv7DZ31rJ24nwNMbH2ZMadopfYankeb7qi257E", + "digest": "beu57u2iKq1YJqbqJcLPVmr4ivPeufYmyfWpkGPtSVc", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -162,7 +162,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "AQrGU4HkLwDQh2yQsc5vuvx674EhEZRXKibUTEkKKiyh", + "digest": "GyF3qZjgqSD8utk2usN6TYnbRCQhfjv1uvoFeo3EMckQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -173,7 +173,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "EXacrf1BUxBuhqY3LPTqVYujEf9HxP6nunMoHLxN8r4V", + "digest": "3Rq4L2TjmHoP8r9DjeGsSegphs4nZmwpiWWYXT7EjDMf", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -184,7 +184,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "vYpcLTqmt69frK9fCE4rXMkbpkc6apXpSvdBjgk5pyH", + "digest": "7AFJxrqmGYWoFgq43BBtFMT1VSVuUwbtY9kH7tsDKVV1", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -195,7 +195,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "2wv6uo96d6svx9U9h7FeyqfRxm3SWvKLqEW6vZfAcJU4", + "digest": "2P2FY8peWtJpdceEpAeQARHiXo7EUDhbHQhiqdxruRBf", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -223,7 +223,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "vYpcLTqmt69frK9fCE4rXMkbpkc6apXpSvdBjgk5pyH", + "digest": "7AFJxrqmGYWoFgq43BBtFMT1VSVuUwbtY9kH7tsDKVV1", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -251,7 +251,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "AQrGU4HkLwDQh2yQsc5vuvx674EhEZRXKibUTEkKKiyh", + "digest": "GyF3qZjgqSD8utk2usN6TYnbRCQhfjv1uvoFeo3EMckQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "BpHP1cdAfDYy5FpXgd5JY9Cj6p2BqqAbaWNQ4g14Qm8f", + "digest": "BqRT6Fi9kcAgBuvPREMXYsJYbt4fkq21KpzyCq6sZYx4", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -307,7 +307,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EL2y9pXhcQ7jdKdhtxiggBDG8L887rZBNyrZ8DLqk1j1", + "digest": "FYcmiwLn8mnCXVnDeP1PPpjyWgtfAugYYNcyimeJvc4v", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -335,7 +335,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "82N4LBFmaEscQ9GKkdnxsSPBMTYF6SWFgQZE9ktU1zLb", + "digest": "DfjWRDQ1UHqEoxEeg9qiTWE4UHGQpWpuZ9HsjPFWrcWw", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp index fd55522375e..a66574c8b7d 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp @@ -94,7 +94,7 @@ Response: { }, "nodes": [ { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -102,7 +102,7 @@ Response: { } }, { - "digest": "381JoeMBiPrexDn1WJRBgXvL8YLm1YD4WrbTMmhVXn8G", + "digest": "6MzShwo92NJGU6u9RMBzVvbk49dLZikc9Lsxs4aEMezA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -110,7 +110,7 @@ Response: { } }, { - "digest": "6eQjG3m7dHWpAVFPodWZfvM2UrM3MjW47MdJZn9vzu8W", + "digest": "HJdkZSnj3kDUJ7pawzZEsik84SvBgToZ5Ru4AxhQ656J", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { } }, { - "digest": "3vqZRmWevrxy8GQv2FpbuBqge21KZ6ANbp1KKgBJHC75", + "digest": "HB3rnQsJtwHwp6aZpbV1vexvtaqHZjusnVnLG1hHXDt9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -126,7 +126,7 @@ Response: { } }, { - "digest": "F5i62q7626r5BpFgS98ipUzH9qKpZYtynQVokRMr4Bud", + "digest": "5CpsoQi9Pt9MUA47obnpfh8QESsgtjyuxjzNv7WiQh4W", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -134,7 +134,7 @@ Response: { } }, { - "digest": "2eeRQ3XbsLZgH21mfmpBaoUiDJj3HbKwGcHMksU5RbT3", + "digest": "5g9j6XatUdA6wT5pttwSdt8dxvGXzxK9uyfkZXMCoJxr", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -142,7 +142,7 @@ Response: { } }, { - "digest": "8XusPMVAwdySmqJL7nMqPMn3Kude5kvrAEKtmT9pa8uy", + "digest": "BCeYmUA1DXGnMfkWgCiQb3LRVKLqjMhtQKNcP4vxmeJy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -150,7 +150,7 @@ Response: { } }, { - "digest": "5MjTfiLsxWBUGdohn2ugDrmshzgDQVFDta3GEC5SrbdD", + "digest": "4Q7AcgnrWrJhVgC7iVuRV1Mpg6W81V3Fuuawh63pSrGB", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -158,7 +158,7 @@ Response: { } }, { - "digest": "4B6QNjxvt3dpDDf6tAWVRYoft8dYXU9fAHNn7WmKJard", + "digest": "3rRXRr9qyqXtYEdkQh2cDyp4EYT2T4S6YBUZyWPCJCRt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -166,7 +166,7 @@ Response: { } }, { - "digest": "2p2mpwjUNzYRm27vpM6aWF8ZRGFZGMfecT3yqmbmCpVK", + "digest": "219CcZRHzj41WjoBkuWWhTdXjz4qUmMTS6TWoLdQHeV7", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -191,7 +191,7 @@ Response: { }, "nodes": [ { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -199,7 +199,7 @@ Response: { } }, { - "digest": "381JoeMBiPrexDn1WJRBgXvL8YLm1YD4WrbTMmhVXn8G", + "digest": "6MzShwo92NJGU6u9RMBzVvbk49dLZikc9Lsxs4aEMezA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -207,7 +207,7 @@ Response: { } }, { - "digest": "6eQjG3m7dHWpAVFPodWZfvM2UrM3MjW47MdJZn9vzu8W", + "digest": "HJdkZSnj3kDUJ7pawzZEsik84SvBgToZ5Ru4AxhQ656J", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -215,7 +215,7 @@ Response: { } }, { - "digest": "3vqZRmWevrxy8GQv2FpbuBqge21KZ6ANbp1KKgBJHC75", + "digest": "HB3rnQsJtwHwp6aZpbV1vexvtaqHZjusnVnLG1hHXDt9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -223,7 +223,7 @@ Response: { } }, { - "digest": "F5i62q7626r5BpFgS98ipUzH9qKpZYtynQVokRMr4Bud", + "digest": "5CpsoQi9Pt9MUA47obnpfh8QESsgtjyuxjzNv7WiQh4W", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -231,7 +231,7 @@ Response: { } }, { - "digest": "2eeRQ3XbsLZgH21mfmpBaoUiDJj3HbKwGcHMksU5RbT3", + "digest": "5g9j6XatUdA6wT5pttwSdt8dxvGXzxK9uyfkZXMCoJxr", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -239,7 +239,7 @@ Response: { } }, { - "digest": "8XusPMVAwdySmqJL7nMqPMn3Kude5kvrAEKtmT9pa8uy", + "digest": "BCeYmUA1DXGnMfkWgCiQb3LRVKLqjMhtQKNcP4vxmeJy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -247,7 +247,7 @@ Response: { } }, { - "digest": "5MjTfiLsxWBUGdohn2ugDrmshzgDQVFDta3GEC5SrbdD", + "digest": "4Q7AcgnrWrJhVgC7iVuRV1Mpg6W81V3Fuuawh63pSrGB", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -255,7 +255,7 @@ Response: { } }, { - "digest": "4B6QNjxvt3dpDDf6tAWVRYoft8dYXU9fAHNn7WmKJard", + "digest": "3rRXRr9qyqXtYEdkQh2cDyp4EYT2T4S6YBUZyWPCJCRt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -263,7 +263,7 @@ Response: { } }, { - "digest": "2p2mpwjUNzYRm27vpM6aWF8ZRGFZGMfecT3yqmbmCpVK", + "digest": "219CcZRHzj41WjoBkuWWhTdXjz4qUmMTS6TWoLdQHeV7", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -311,7 +311,7 @@ Response: { }, "nodes": [ { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -319,7 +319,7 @@ Response: { } }, { - "digest": "381JoeMBiPrexDn1WJRBgXvL8YLm1YD4WrbTMmhVXn8G", + "digest": "6MzShwo92NJGU6u9RMBzVvbk49dLZikc9Lsxs4aEMezA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -327,7 +327,7 @@ Response: { } }, { - "digest": "6eQjG3m7dHWpAVFPodWZfvM2UrM3MjW47MdJZn9vzu8W", + "digest": "HJdkZSnj3kDUJ7pawzZEsik84SvBgToZ5Ru4AxhQ656J", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -335,7 +335,7 @@ Response: { } }, { - "digest": "3vqZRmWevrxy8GQv2FpbuBqge21KZ6ANbp1KKgBJHC75", + "digest": "HB3rnQsJtwHwp6aZpbV1vexvtaqHZjusnVnLG1hHXDt9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -343,7 +343,7 @@ Response: { } }, { - "digest": "F5i62q7626r5BpFgS98ipUzH9qKpZYtynQVokRMr4Bud", + "digest": "5CpsoQi9Pt9MUA47obnpfh8QESsgtjyuxjzNv7WiQh4W", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -351,7 +351,7 @@ Response: { } }, { - "digest": "2eeRQ3XbsLZgH21mfmpBaoUiDJj3HbKwGcHMksU5RbT3", + "digest": "5g9j6XatUdA6wT5pttwSdt8dxvGXzxK9uyfkZXMCoJxr", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -359,7 +359,7 @@ Response: { } }, { - "digest": "8XusPMVAwdySmqJL7nMqPMn3Kude5kvrAEKtmT9pa8uy", + "digest": "BCeYmUA1DXGnMfkWgCiQb3LRVKLqjMhtQKNcP4vxmeJy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -367,7 +367,7 @@ Response: { } }, { - "digest": "5MjTfiLsxWBUGdohn2ugDrmshzgDQVFDta3GEC5SrbdD", + "digest": "4Q7AcgnrWrJhVgC7iVuRV1Mpg6W81V3Fuuawh63pSrGB", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -375,7 +375,7 @@ Response: { } }, { - "digest": "4B6QNjxvt3dpDDf6tAWVRYoft8dYXU9fAHNn7WmKJard", + "digest": "3rRXRr9qyqXtYEdkQh2cDyp4EYT2T4S6YBUZyWPCJCRt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -383,7 +383,7 @@ Response: { } }, { - "digest": "2p2mpwjUNzYRm27vpM6aWF8ZRGFZGMfecT3yqmbmCpVK", + "digest": "219CcZRHzj41WjoBkuWWhTdXjz4qUmMTS6TWoLdQHeV7", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -431,7 +431,7 @@ Response: { }, "nodes": [ { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -439,7 +439,7 @@ Response: { } }, { - "digest": "381JoeMBiPrexDn1WJRBgXvL8YLm1YD4WrbTMmhVXn8G", + "digest": "6MzShwo92NJGU6u9RMBzVvbk49dLZikc9Lsxs4aEMezA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -447,7 +447,7 @@ Response: { } }, { - "digest": "6eQjG3m7dHWpAVFPodWZfvM2UrM3MjW47MdJZn9vzu8W", + "digest": "HJdkZSnj3kDUJ7pawzZEsik84SvBgToZ5Ru4AxhQ656J", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -455,7 +455,7 @@ Response: { } }, { - "digest": "3vqZRmWevrxy8GQv2FpbuBqge21KZ6ANbp1KKgBJHC75", + "digest": "HB3rnQsJtwHwp6aZpbV1vexvtaqHZjusnVnLG1hHXDt9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -463,7 +463,7 @@ Response: { } }, { - "digest": "F5i62q7626r5BpFgS98ipUzH9qKpZYtynQVokRMr4Bud", + "digest": "5CpsoQi9Pt9MUA47obnpfh8QESsgtjyuxjzNv7WiQh4W", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -471,7 +471,7 @@ Response: { } }, { - "digest": "2eeRQ3XbsLZgH21mfmpBaoUiDJj3HbKwGcHMksU5RbT3", + "digest": "5g9j6XatUdA6wT5pttwSdt8dxvGXzxK9uyfkZXMCoJxr", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -479,7 +479,7 @@ Response: { } }, { - "digest": "8XusPMVAwdySmqJL7nMqPMn3Kude5kvrAEKtmT9pa8uy", + "digest": "BCeYmUA1DXGnMfkWgCiQb3LRVKLqjMhtQKNcP4vxmeJy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -487,7 +487,7 @@ Response: { } }, { - "digest": "5MjTfiLsxWBUGdohn2ugDrmshzgDQVFDta3GEC5SrbdD", + "digest": "4Q7AcgnrWrJhVgC7iVuRV1Mpg6W81V3Fuuawh63pSrGB", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -495,7 +495,7 @@ Response: { } }, { - "digest": "4B6QNjxvt3dpDDf6tAWVRYoft8dYXU9fAHNn7WmKJard", + "digest": "3rRXRr9qyqXtYEdkQh2cDyp4EYT2T4S6YBUZyWPCJCRt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -503,7 +503,7 @@ Response: { } }, { - "digest": "2p2mpwjUNzYRm27vpM6aWF8ZRGFZGMfecT3yqmbmCpVK", + "digest": "219CcZRHzj41WjoBkuWWhTdXjz4qUmMTS6TWoLdQHeV7", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -592,7 +592,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "E8kF2A56xvnkYLD4BDps6aLwq2Cie3s9Ukiic1ZH7viP", + "digest": "534nNMC3uDHb82imUGTyEd5hWoQ9aaSgJFH1g4DSSXT8", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp index 9b4c4f42156..32a0c281c4c 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp @@ -42,7 +42,7 @@ Response: { "transactions": { "nodes": [ { - "package": "0xf9fc400a000c3d386bc82b2fce66cfd9af411aa08644ae3ec0b12931079f3747", + "package": "0x185b1dba6bdaec1ae8e35a5db53e582f5ae6db633b42566053598ca5073c229e", "module": "m", "functionName": "get" } @@ -55,17 +55,17 @@ Response: { "nodes": [ { "__typename": "SharedObjectRead", - "address": "0x86326d81edb82c2f82fa925fcb6e69bbd02dda8f19b61efb01621e555bf8de6a", + "address": "0xf1ecf05a9c55d81d37ff9ab3fd4b354119b05acd315615f164fbe6855abe02a9", "version": 2, - "digest": "GTLkfmQnXxUTskYsN5PZwgtutXdgaEqK2xHeKvVakZTZ", + "digest": "wSRviLEwvAccgAx86uDMCjNHqCirJMKJkdUCzN632Lb", "object": { "asMoveObject": { "contents": { "type": { - "repr": "0xf9fc400a000c3d386bc82b2fce66cfd9af411aa08644ae3ec0b12931079f3747::m::Foo" + "repr": "0x185b1dba6bdaec1ae8e35a5db53e582f5ae6db633b42566053598ca5073c229e::m::Foo" }, "json": { - "id": "0x86326d81edb82c2f82fa925fcb6e69bbd02dda8f19b61efb01621e555bf8de6a", + "id": "0xf1ecf05a9c55d81d37ff9ab3fd4b354119b05acd315615f164fbe6855abe02a9", "x": "0" } } @@ -82,7 +82,7 @@ Response: { "transactions": { "nodes": [ { - "package": "0xf9fc400a000c3d386bc82b2fce66cfd9af411aa08644ae3ec0b12931079f3747", + "package": "0x185b1dba6bdaec1ae8e35a5db53e582f5ae6db633b42566053598ca5073c229e", "module": "m", "functionName": "inc" } @@ -102,12 +102,12 @@ Response: { "transactions": { "nodes": [ { - "package": "0xf9fc400a000c3d386bc82b2fce66cfd9af411aa08644ae3ec0b12931079f3747", + "package": "0x185b1dba6bdaec1ae8e35a5db53e582f5ae6db633b42566053598ca5073c229e", "module": "m", "functionName": "get" }, { - "package": "0xf9fc400a000c3d386bc82b2fce66cfd9af411aa08644ae3ec0b12931079f3747", + "package": "0x185b1dba6bdaec1ae8e35a5db53e582f5ae6db633b42566053598ca5073c229e", "module": "m", "functionName": "inc" } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp index c5166f9b177..9345d93625b 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp @@ -7,7 +7,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS", + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r", "sender": null, "signatures": [ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" @@ -407,7 +407,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000008", "inner": { - "id": "0x9b0bff650abbfb6f12494e571d931a5d67d633bdcb4cf09c0266d682e9a2670d", + "id": "0x29823d2f1c096f2b9af514ad2d880d004c9c40efd319094f846acf1a701daea1", "version": "1" } } @@ -489,7 +489,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000403", "lists": { - "id": "0x3d983c2ef1bb228a71282a622fe7ce49979e88ca70e4df9b4832f1d494afac6e", + "id": "0x91089d2630db46584a9e572d18d3522fa38a61c0449b7d686ceba298353c1b13", "size": "0" } } @@ -641,16 +641,17 @@ Response: { { "cursor": "eyJpIjoxMCwiYyI6MH0", "node": { - "address": "0x2e5e399d18ca7ecd319b2dc0ad24eeac2a73a4cae66617384a50873805a05cdc", + "address": "0x18f84f682083f9c9db0f292daef27d31eba97e1e2e533eb3e6c5e155cfaa6d59", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x2e5e399d18ca7ecd319b2dc0ad24eeac2a73a4cae66617384a50873805a05cdc", - "name": "0x8cd284d020e13d86f523347e580827a00e0290c058bf869e1f9171064156c422", - "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" + "id": "0x18f84f682083f9c9db0f292daef27d31eba97e1e2e533eb3e6c5e155cfaa6d59", + "balance": { + "value": "300000000000000" + } } } }, @@ -659,6 +660,128 @@ Response: { }, { "cursor": "eyJpIjoxMSwiYyI6MH0", + "node": { + "address": "0x1e2e31d42cab71c51a09ddd6ddd84cab632e626b7dbf1818d378c59922b6d5f6", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + }, + "json": { + "id": "0x1e2e31d42cab71c51a09ddd6ddd84cab632e626b7dbf1818d378c59922b6d5f6", + "name": "0", + "value": { + "iota_amount": "0", + "pool_token_amount": "0" + } + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxMiwiYyI6MH0", + "node": { + "address": "0x2549136690b4dc477cf36925a82cc7da46a9f8310a4371b1fe6342194451e48c", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota" + }, + "json": { + "id": "0x2549136690b4dc477cf36925a82cc7da46a9f8310a4371b1fe6342194451e48c", + "pool_id": "0x646367f3ac89a78831f8aec1b5361b585451cb5b1181dbfabe9834c334b00bb9", + "stake_activation_epoch": "0", + "principal": { + "value": "1500000000000000" + } + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxMywiYyI6MH0", + "node": { + "address": "0x515e1c93964e5d51ba0cb24331b8228f15858f5a062a415471837e6a05dbfc60", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + }, + "json": { + "id": "0x515e1c93964e5d51ba0cb24331b8228f15858f5a062a415471837e6a05dbfc60", + "name": "1", + "value": { + "version": "1", + "epoch": "0", + "randomness_round": "0", + "random_bytes": [] + } + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxNCwiYyI6MH0", + "node": { + "address": "0x54cea84200cfb027c987c84432d13a429e2fe38ca123729bf2254c0580341c2f", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" + }, + "json": { + "id": "0x54cea84200cfb027c987c84432d13a429e2fe38ca123729bf2254c0580341c2f", + "fields": { + "contents": [ + { + "key": "name", + "value": "{immutable_metadata.name}" + }, + { + "key": "image_url", + "value": "{immutable_metadata.uri}" + }, + { + "key": "description", + "value": "{immutable_metadata.description}" + }, + { + "key": "creator", + "value": "{immutable_metadata.issuer_name}" + }, + { + "key": "version", + "value": "{immutable_metadata.version}" + }, + { + "key": "media_type", + "value": "{immutable_metadata.media_type}" + }, + { + "key": "collection_name", + "value": "{immutable_metadata.collection_name}" + }, + { + "key": "immutable_issuer", + "value": "{immutable_issuer}" + } + ] + }, + "version": 1 + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxNSwiYyI6MH0", "node": { "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", "asMoveObject": { @@ -696,16 +819,40 @@ Response: { } }, { - "cursor": "eyJpIjoxMiwiYyI6MH0", + "cursor": "eyJpIjoxNiwiYyI6MH0", "node": { - "address": "0x5bd1afad59adf47ff03ce0903c23d9e730486ae8bc8a4fab7f3a232e753cec95", + "address": "0x5eb352ff17a3a93f6e9d6ab38ad27eb55a72b652bf73f248cdbdf1649b4a27c5", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + }, + "json": { + "id": "0x5eb352ff17a3a93f6e9d6ab38ad27eb55a72b652bf73f248cdbdf1649b4a27c5", + "decimals": 9, + "name": "IOTA", + "symbol": "IOTA", + "description": "The main (gas)token of the IOTA Network.", + "icon_url": { + "url": "https://iota.org/logo.png" + } + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxNywiYyI6MH0", + "node": { + "address": "0x605f984526ad112fd2ae1e1c82ac346fa445004bb26bee040342f822f7f55f5c", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x5bd1afad59adf47ff03ce0903c23d9e730486ae8bc8a4fab7f3a232e753cec95", + "id": "0x605f984526ad112fd2ae1e1c82ac346fa445004bb26bee040342f822f7f55f5c", "balance": { "value": "30000000000000000" } @@ -716,13 +863,13 @@ Response: { } }, { - "cursor": "eyJpIjoxMywiYyI6MH0", + "cursor": "eyJpIjoxOCwiYyI6MH0", "node": { "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" }, "json": { "id": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", @@ -733,7 +880,7 @@ Response: { "system_state_version": "1", "iota_treasury_cap": { "inner": { - "id": "0xcb3716cce2d720cab8d16276a3463033b04885f668ea8cda8d6a4d8b37d58e88", + "id": "0x848b4a3dea3a749f03059541733124d66808d101aefdb764a87b1db93e3a4bfe", "total_supply": { "value": "31800000000000000" } @@ -982,15 +1129,15 @@ Response: { "next_epoch_primary_address": null, "next_epoch_worker_address": null, "extra_fields": { - "id": "0x88cdce81617929f864ec57fbfcc79d24eb34cb3e0d7432a1f587a339c0484aad", + "id": "0xa815336401cb06145cd2bf5b3604eef29d806e37acc8bae04d27ab11195a506e", "size": "0" } }, "voting_power": "10000", - "operation_cap_id": "0xfdde00adbcba41b235bdd32e4604b6beda90c1799d329885b2ca634e5f0acda9", + "operation_cap_id": "0xa475e7b7c6f2fc7008894d00adf34ba5894ad30eeff778052f353d56d5bd2a1c", "gas_price": "1000", "staking_pool": { - "id": "0x8cd284d020e13d86f523347e580827a00e0290c058bf869e1f9171064156c422", + "id": "0x646367f3ac89a78831f8aec1b5361b585451cb5b1181dbfabe9834c334b00bb9", "activation_epoch": "0", "deactivation_epoch": null, "iota_balance": "1500000000000000", @@ -999,14 +1146,14 @@ Response: { }, "pool_token_balance": "1500000000000000", "exchange_rates": { - "id": "0x8346021e7700cb9863b90cbacce1eed0ec4e056869269040a1a3ca9a2388e0a6", + "id": "0x6c2e1d7d8067ea02871ae0fd5358777e443ee930d9ea097afadf290ec9b07077", "size": "1" }, "pending_stake": "0", "pending_total_iota_withdraw": "0", "pending_pool_token_withdraw": "0", "extra_fields": { - "id": "0xfb657ce48ad724066cac09f7f627bc301d8faba3bc22124ddf7692f20b3c9ba9", + "id": "0xf2aad86aaf62f4cf4d6fcdce68bd3b05b6355ab6c6c8c54260b908ee4642dd74", "size": "0" } }, @@ -1015,35 +1162,35 @@ Response: { "next_epoch_gas_price": "1000", "next_epoch_commission_rate": "200", "extra_fields": { - "id": "0xb19d8a00d933c1f6c902783f6a9532f3bace7cb0f2b551643e8b7931c0a41fcc", + "id": "0x788580eb1b83a2e6ef2aeee303d4c945f6f19f667395ead435b7873bb1ad6dbc", "size": "0" } } ], "pending_active_validators": { "contents": { - "id": "0x6038b75940d4d60023be22ceb7382231fe9ff12df87c8a5d4fd9b083a7d9c959", + "id": "0x661576d7ecdcdbcea9e0ed89a7e57222208cbda9f0c478e73f964381a2dccfca", "size": "0" } }, "pending_removals": [], "staking_pool_mappings": { - "id": "0xb0b78b6f7fd0292d0426f5d43fd08ff40aab790ae763e24f4277b8d60f95ea8b", + "id": "0x1e58b86ad61f09a98911a0eba3105c8bfd126b0f0397861c0044b05c27d642c9", "size": "1" }, "inactive_validators": { - "id": "0xaa75dbf439e25feca225bb6d9cf5020ef4248a1e44d4f3182bef2aaf6d57316e", + "id": "0x11875572b826142d948a0d6712f48eafaf3a56a7bedf323e8ed59d880d9f1c30", "size": "0" }, "validator_candidates": { - "id": "0x0c8ff6b962f84638b45618d59921f52155c31037b692345722eb306aea3958ed", + "id": "0xc50e0d500a0d55ac13d1203a7ab1ec3d577c2bd0d6d9449bd904db42e215dd7a", "size": "0" }, "at_risk_validators": { "contents": [] }, "extra_fields": { - "id": "0x258b1425cc21143065592e0b0583ace1c70b65ef8c1be0d4b77aae5f00a073ae", + "id": "0xde39de393a953d3573d0bca8f65869f8fe7ecf9d5c86c74e7c8cb78e9a429530", "size": "0" } }, @@ -1057,13 +1204,14 @@ Response: { }, "parameters": { "epoch_duration_ms": "86400000", + "min_validator_count": "4", "max_validator_count": "150", "min_validator_joining_stake": "2000000000000000", "validator_low_stake_threshold": "1500000000000000", "validator_very_low_stake_threshold": "1000000000000000", "validator_low_stake_grace_period": "7", "extra_fields": { - "id": "0xc971bfbb567f68e0b0f2786ffe99ca20cda50b54a67ab24bb546a973a1939922", + "id": "0xa69950f479a14041fb56369da0be5610020806dca2a0f849f13d67147770ce47", "size": "0" } }, @@ -1082,7 +1230,7 @@ Response: { "safe_mode_non_refundable_storage_fee": "0", "epoch_start_timestamp_ms": "0", "extra_fields": { - "id": "0xe6e63dd5255e53cc6327e0b33381e62d1dbd6502c629fe92de1d91369208a127", + "id": "0x280ef684a4959e57280dc6f937a1e9ca2010e7a0cebae1ebe1e8f81248cef974", "size": "0" } } @@ -1092,166 +1240,18 @@ Response: { "asMovePackage": null } }, - { - "cursor": "eyJpIjoxNCwiYyI6MH0", - "node": { - "address": "0x752b9d1d48c269700369ab5f605bcdbedd8439713ac3e3700dd1d88940539079", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" - }, - "json": { - "id": "0x752b9d1d48c269700369ab5f605bcdbedd8439713ac3e3700dd1d88940539079", - "name": "0", - "value": { - "iota_amount": "0", - "pool_token_amount": "0" - } - } - } - }, - "asMovePackage": null - } - }, - { - "cursor": "eyJpIjoxNSwiYyI6MH0", - "node": { - "address": "0xaa95175b10fb46393b0345df4f2d601d973779e57930cf4f5fd815243f07e25b", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" - }, - "json": { - "id": "0xaa95175b10fb46393b0345df4f2d601d973779e57930cf4f5fd815243f07e25b", - "fields": { - "contents": [ - { - "key": "name", - "value": "{immutable_metadata.name}" - }, - { - "key": "image_url", - "value": "{immutable_metadata.uri}" - }, - { - "key": "description", - "value": "{immutable_metadata.description}" - }, - { - "key": "creator", - "value": "{immutable_metadata.issuer_name}" - }, - { - "key": "version", - "value": "{immutable_metadata.version}" - }, - { - "key": "media_type", - "value": "{immutable_metadata.media_type}" - }, - { - "key": "collection_name", - "value": "{immutable_metadata.collection_name}" - }, - { - "key": "immutable_issuer", - "value": "{immutable_issuer}" - } - ] - }, - "version": 1 - } - } - }, - "asMovePackage": null - } - }, - { - "cursor": "eyJpIjoxNiwiYyI6MH0", - "node": { - "address": "0xb3c00060d11753961f85d64a1eb75e4c8ecbedcd6a01c129dc9371e997c8e820", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" - }, - "json": { - "id": "0xb3c00060d11753961f85d64a1eb75e4c8ecbedcd6a01c129dc9371e997c8e820", - "name": "1", - "value": { - "version": "1", - "epoch": "0", - "randomness_round": "0", - "random_bytes": [] - } - } - } - }, - "asMovePackage": null - } - }, - { - "cursor": "eyJpIjoxNywiYyI6MH0", - "node": { - "address": "0xc0373196e899fd39844faf7136371e96bb670937e6ca6db40a23f6d3beb0f73d", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota" - }, - "json": { - "id": "0xc0373196e899fd39844faf7136371e96bb670937e6ca6db40a23f6d3beb0f73d", - "pool_id": "0x8cd284d020e13d86f523347e580827a00e0290c058bf869e1f9171064156c422", - "stake_activation_epoch": "0", - "principal": { - "value": "1500000000000000" - } - } - } - }, - "asMovePackage": null - } - }, - { - "cursor": "eyJpIjoxOCwiYyI6MH0", - "node": { - "address": "0xc5535686aa2907a01a21788ea80f64964405315c9520b508fe7d2d5c89e00773", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" - }, - "json": { - "id": "0xc5535686aa2907a01a21788ea80f64964405315c9520b508fe7d2d5c89e00773", - "balance": { - "value": "300000000000000" - } - } - } - }, - "asMovePackage": null - } - }, { "cursor": "eyJpIjoxOSwiYyI6MH0", "node": { - "address": "0xe5aac8bcf554c1042d4ef2d8d0f10f3d7cbea696e3a273edceb6e5a9a0f5bc3c", + "address": "0xa475e7b7c6f2fc7008894d00adf34ba5894ad30eeff778052f353d56d5bd2a1c", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap" }, "json": { - "id": "0xe5aac8bcf554c1042d4ef2d8d0f10f3d7cbea696e3a273edceb6e5a9a0f5bc3c", - "decimals": 9, - "name": "IOTA", - "symbol": "IOTA", - "description": "The main (gas)token of the IOTA Network.", - "icon_url": { - "url": "https://iota.org/logo.png" - } + "id": "0xa475e7b7c6f2fc7008894d00adf34ba5894ad30eeff778052f353d56d5bd2a1c", + "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" } } }, @@ -1298,7 +1298,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "digest": "7cgNadRpZenpQ7ygpVmZM9GKxkeWw35hgJPtphSAnUe2" + "digest": "8JwHpitzeA8okAWz24EsgaSLiyLSbgNHnHJyC6Ban6ZY" } }, { @@ -1307,7 +1307,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000002", - "digest": "FsCStMzwMzkniXfb2ogr3t7nMowr848JYek6MoohyiF3" + "digest": "CJDEbxaHcoQcRckLy2MLUcUq3TtnMdiYo2o2dUt5eyJK" } }, { @@ -1316,7 +1316,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000003", - "digest": "s3KTF9G1VsMpvs683DrgFCd2AAcE31FAy9Wbtdbrxoy" + "digest": "839Hn27RQDaLGLBKKYzzNVhstTXJ1iFUgCjuqRXdVR2g" } }, { @@ -1325,7 +1325,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000005", - "digest": "8NRT2wkVGJU9M4JJ9oPWjayoyH9tzKnS2pAUuk57sdt3" + "digest": "A7CDZixkoWgYgjzZ221tZFyC3mU2qDTaARPDp2WrQ99x" } }, { @@ -1334,7 +1334,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000006", - "digest": "GMR5XB9aRMsMPF4xcSzLp8vgfF1J1k2CvU5VMHfhaipk" + "digest": "69YDF2Gx7VYKYTg9bx5wygVMfmWo6vtWLfKZFUp25QVj" } }, { @@ -1343,7 +1343,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000008", - "digest": "8Lv49VmxfFtxThUqLUZ3j1A6YcferFXrNJonSPYvdeFQ" + "digest": "H28tp3y9NVk41eBKKjTEe8Cuw9KhH7aa8kjVVJkjX35h" } }, { @@ -1352,7 +1352,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000000b", - "digest": "57D38y7312YkS9cc9rEkubnrmDtiLMtzGGzxoYcCVs2G" + "digest": "HMSyt2Q6wd1XZdsn6o1NNa7zwYbdmfA8rAnzzeWuQEZ1" } }, { @@ -1361,7 +1361,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000403", - "digest": "2dWsccWc9tdVJoTGxXTvjinugXhMEedGkfQ86xDjjha7" + "digest": "jrWEkub4tHVxXLMRkWiodbbxzwz2Ffm7WRkZWHpAD6o" } }, { @@ -1370,7 +1370,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000107a", - "digest": "xG5U3Ye8DVrZn3EoKdA7MEBtbSvWnkVWV4gQKJ2Khgn" + "digest": "4gbrZfCc5dbhwdYnGGfqFqPPRyhy3po5FyT1XJPqYcQp" } }, { @@ -1379,97 +1379,97 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000dee9", - "digest": "4fx27DmgdtUzbg2r5ASLLHVGovhxtSmiqNb2T41QjhWX" + "digest": "vVLhEP8sRqEnzAnmiK58bEFGuJNYSX7Hxw8EcmqehnM" } }, { - "address": "0x2e5e399d18ca7ecd319b2dc0ad24eeac2a73a4cae66617384a50873805a05cdc", + "address": "0x18f84f682083f9c9db0f292daef27d31eba97e1e2e533eb3e6c5e155cfaa6d59", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x2e5e399d18ca7ecd319b2dc0ad24eeac2a73a4cae66617384a50873805a05cdc", - "digest": "8Hx9kdvcGHKi5cT1jac3ftZKUCWvyKt1aoY9rDWS5nZ7" + "address": "0x18f84f682083f9c9db0f292daef27d31eba97e1e2e533eb3e6c5e155cfaa6d59", + "digest": "9vXahRoVxXDmDMoWvsTSd2RUbwAjCjt7VA5ef7KLvz4j" } }, { - "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", + "address": "0x1e2e31d42cab71c51a09ddd6ddd84cab632e626b7dbf1818d378c59922b6d5f6", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", - "digest": "GxVKeKVUbR8oyCYz7bKypUJco36TmSFcmke2qGXEGrb4" + "address": "0x1e2e31d42cab71c51a09ddd6ddd84cab632e626b7dbf1818d378c59922b6d5f6", + "digest": "4akELLgyYN4fB2vDFF4XMFMF2fBtqfRJB8W3VFn9XGaC" } }, { - "address": "0x5bd1afad59adf47ff03ce0903c23d9e730486ae8bc8a4fab7f3a232e753cec95", + "address": "0x2549136690b4dc477cf36925a82cc7da46a9f8310a4371b1fe6342194451e48c", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x5bd1afad59adf47ff03ce0903c23d9e730486ae8bc8a4fab7f3a232e753cec95", - "digest": "A4S7hPQ4bG5dzzoskiVyJnDu4Hs7PbcPvJrygKZKLTbJ" + "address": "0x2549136690b4dc477cf36925a82cc7da46a9f8310a4371b1fe6342194451e48c", + "digest": "GL9h3Dj3jnJzTCQbiSwPfxjKgDstYGzU6mPj48vy358F" } }, { - "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "address": "0x515e1c93964e5d51ba0cb24331b8228f15858f5a062a415471837e6a05dbfc60", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "digest": "EhZjsQeqGqD855yBns5c7Rib7wTmcdK71etNZb9DwEEF" + "address": "0x515e1c93964e5d51ba0cb24331b8228f15858f5a062a415471837e6a05dbfc60", + "digest": "2zgfPopEBFcFKpFvevZgzXbNvoKDMLn4ezengHEd7Yxx" } }, { - "address": "0x752b9d1d48c269700369ab5f605bcdbedd8439713ac3e3700dd1d88940539079", + "address": "0x54cea84200cfb027c987c84432d13a429e2fe38ca123729bf2254c0580341c2f", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x752b9d1d48c269700369ab5f605bcdbedd8439713ac3e3700dd1d88940539079", - "digest": "3YbcuCVWCJJqUAVzwPNDHbjJdMiRb54e5CDMtpnfkuU5" + "address": "0x54cea84200cfb027c987c84432d13a429e2fe38ca123729bf2254c0580341c2f", + "digest": "F3GHeoBKmujo9go67sFxLELbjUhBFUzeaEhpsxBBnxN4" } }, { - "address": "0xaa95175b10fb46393b0345df4f2d601d973779e57930cf4f5fd815243f07e25b", + "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xaa95175b10fb46393b0345df4f2d601d973779e57930cf4f5fd815243f07e25b", - "digest": "9SzpvTRVPqS5ZorvBkaU2SYGGybjN4pvLMLPk7y1WLE6" + "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", + "digest": "DdEaHoBjRYSKE6tShcZctdQ2CbbpGgpwMY9zrReDZmoD" } }, { - "address": "0xb3c00060d11753961f85d64a1eb75e4c8ecbedcd6a01c129dc9371e997c8e820", + "address": "0x5eb352ff17a3a93f6e9d6ab38ad27eb55a72b652bf73f248cdbdf1649b4a27c5", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xb3c00060d11753961f85d64a1eb75e4c8ecbedcd6a01c129dc9371e997c8e820", - "digest": "CshpM12CqWmxLNhXYDELLz7Q9ovRXky942yvuAUhyYQc" + "address": "0x5eb352ff17a3a93f6e9d6ab38ad27eb55a72b652bf73f248cdbdf1649b4a27c5", + "digest": "GnDWMoee36nn3Ba9JMgcd7DswMnL47h2APoYXpn9z24P" } }, { - "address": "0xc0373196e899fd39844faf7136371e96bb670937e6ca6db40a23f6d3beb0f73d", + "address": "0x605f984526ad112fd2ae1e1c82ac346fa445004bb26bee040342f822f7f55f5c", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc0373196e899fd39844faf7136371e96bb670937e6ca6db40a23f6d3beb0f73d", - "digest": "KiEQRVkgNnqFo3yjmzrTGm6BuxorcgEW6g8kEMmk8BN" + "address": "0x605f984526ad112fd2ae1e1c82ac346fa445004bb26bee040342f822f7f55f5c", + "digest": "tKSSBHTeP5yyHox12sNqfu1AjhvGdazgdWRJ2WabAcF" } }, { - "address": "0xc5535686aa2907a01a21788ea80f64964405315c9520b508fe7d2d5c89e00773", + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc5535686aa2907a01a21788ea80f64964405315c9520b508fe7d2d5c89e00773", - "digest": "2KB73tvWw1mENKAVVCdCK8FgSPHvs28ENzjyEiCSeji6" + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "digest": "AZbr2T12BNYKbD4RCFWGBGxqG7Jom23CK7k1oJTDR1NZ" } }, { - "address": "0xe5aac8bcf554c1042d4ef2d8d0f10f3d7cbea696e3a273edceb6e5a9a0f5bc3c", + "address": "0xa475e7b7c6f2fc7008894d00adf34ba5894ad30eeff778052f353d56d5bd2a1c", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xe5aac8bcf554c1042d4ef2d8d0f10f3d7cbea696e3a273edceb6e5a9a0f5bc3c", - "digest": "3GDVtpc52mMrxEt6wk4R65SY9VhAsiV9q2z2ims4EudZ" + "address": "0xa475e7b7c6f2fc7008894d00adf34ba5894ad30eeff778052f353d56d5bd2a1c", + "digest": "6sHMyUXLZ81rgtttwrufujf1ccs6NrMiuyRBwBoPjLjZ" } } ] @@ -1491,7 +1491,7 @@ Response: { "sequenceNumber": 0 }, "transactionBlock": { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } }, "expiration": null @@ -1543,7 +1543,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } ] }, @@ -1643,7 +1643,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "3HWGXfhsMbMDbQ9KGYSmhxzqnWAbtCfzxu7MjGKJQbnS" + "digest": "AsRLPBc5rJ8gVamHNt3pymcqmeuBhiVkG81QaEfdAN7r" } ] }, @@ -1658,41 +1658,35 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000005", - "digest": "CGyGKFu385GVbKPD57rNrb1fPoLg1G3trazCFvfNWFXF" + "digest": "Do9BxST2vAmc7ZRsxohXXg5S3QLzmgUYYQnP2ejXtP93" } }, { - "address": "0x141a865c4fc0f666c50cdc3ef8abdd4a50a667694b02999dfa8d0061edc69140", + "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x141a865c4fc0f666c50cdc3ef8abdd4a50a667694b02999dfa8d0061edc69140", - "digest": "8K6VqD7hofR2uwWEE47XM6HmSLTUvKDMapqCzA3X428o" + "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d", + "digest": "CLENPduiGDiUzT8J4hEFdLUcs45vmca1WoPCt6tTz5Ui" } }, { - "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d", - "idCreated": true, + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d", - "digest": "8s4nsKXNNPpvvKUAfkfPoNTxBE9uHvo4E4m4zCLJupiz" + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "digest": "9vTAPRLv7reySnYJ2MM5WUUsVStnucDQiPzJMp3v5W4J" } }, { - "address": "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1", + "address": "0x9af516c8b7f6cf50a50bb1383b16887ab2841ad4fccbaf1b7cafb1c479920edc", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1", - "digest": "5YdnW7Yrv1VfiEKbJA7tdr8LbNpp6kWTW4hLUaJZy3U2" + "address": "0x9af516c8b7f6cf50a50bb1383b16887ab2841ad4fccbaf1b7cafb1c479920edc", + "digest": "4DRyPLwGzStV7RmG2WkrHZSiSvjvMeMrLo6DkKuiVhF2" } - }, - { - "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "idCreated": false, - "idDeleted": true, - "outputState": null } ] }, From e2a324dd367ee8a2e8da7b7ebeb013c5524e1b5d Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 11:18:26 +0200 Subject: [PATCH 40/62] fix(framework): after merge --- Cargo.lock | 75 +++++++++++++++++- .../sources/iota_system_state_inner.move | 4 +- .../packages_compiled/iota-system | Bin 43057 -> 42328 bytes 3 files changed, 76 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79dc02cac9a..8627492edc9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1083,6 +1083,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "aws-lc-rs" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" +dependencies = [ + "bindgen 0.69.5", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "aws-runtime" version = "1.4.3" @@ -1822,6 +1849,29 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.10.5", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2 1.0.86", + "quote 1.0.37", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.77", + "which", +] + [[package]] name = "bip32" version = "0.5.2" @@ -5951,6 +6001,7 @@ dependencies = [ "iota-sdk 0.4.0", "iota-simulator", "iota-storage", + "iota-surfer", "iota-swarm-config", "iota-test-transaction-builder", "iota-types", @@ -7850,6 +7901,7 @@ dependencies = [ "iota-macros", "iota-metrics", "iota-protocol-config", + "iota-simulator", "iota-test-transaction-builder", "iota-types", "itertools 0.13.0", @@ -7864,6 +7916,7 @@ dependencies = [ "percent-encoding", "prometheus", "reqwest 0.12.7", + "rustls 0.23.13", "serde", "serde_json", "tap", @@ -8875,7 +8928,7 @@ version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ - "bindgen", + "bindgen 0.65.1", "bzip2-sys", "cc", "glob", @@ -9260,6 +9313,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + [[package]] name = "mockall" version = "0.11.4" @@ -12957,6 +13016,7 @@ version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ + "aws-lc-rs", "log", "once_cell", "ring 0.17.8", @@ -13072,6 +13132,7 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ + "aws-lc-rs", "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", @@ -15896,6 +15957,18 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "whoami" version = "1.5.2" diff --git a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move index 4f5f67bd476..ba74ebc9bf8 100644 --- a/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move +++ b/crates/iota-framework/packages/iota-system/sources/iota_system_state_inner.move @@ -561,7 +561,7 @@ module iota_system::iota_system_state_inner { /// Update a validator's public key of authority key and proof of possession. /// The change will only take effects starting from the next epoch. public(package) fun update_validator_next_epoch_authority_pubkey( - self: &mut IotaSystemStateInnerV1, + self: &mut IotaSystemStateV1, authority_pubkey: vector, proof_of_possession: vector, ctx: &TxContext, @@ -574,7 +574,7 @@ module iota_system::iota_system_state_inner { /// Update candidate validator's public key of authority key and proof of possession. public(package) fun update_candidate_validator_authority_pubkey( - self: &mut IotaSystemStateInnerV1, + self: &mut IotaSystemStateV1, authority_pubkey: vector, proof_of_possession: vector, ctx: &TxContext, diff --git a/crates/iota-framework/packages_compiled/iota-system b/crates/iota-framework/packages_compiled/iota-system index 9333d70081af8ae444c6b67f0dd9076f672ff4c0..afbcca4763375039c8003abb553d57a749f3c468 100644 GIT binary patch delta 7285 zcmbVRd5~PidGG$->v?Zp_q;bf^JZpecJ`Q^Jw{q-w1=b}R?;5QYPG9tb)OjB7XlsV z00CkUI=~pAm`*tkwh=fO84?Jv#FbS12ZWF+LPG42ib+yVT&es)$YG}_my8n({-8`9ze9~X?URxl@mnkG61$meSE8zs3giDm% zLB2w%PwUjDaur`hC?N~LAf#Sxj?FJOMi?QRU4*$_l#uzJBxJT1Bc#uZ6Vjxi)AI@0 zqTv=@ozSpBL&8fCvQIu2i%M#MnfWG!LMzJs5O&SNAQRjgi!u=Y~YPd)> zJ{aKLy7*8~Jfn-}gW|opGM39N2&Xli3#j*KfeS(LK3!}MAv{ba;v+PVIKyitWMP{@ z=z`fr0+(q|ni3<|$Ed+(j%2AF+FoK*SS`J2V(saT5qls%i-hGIM#5PQ4MPaU)-(x+ z=C(#jc!4VT-3JE8vc!3u4h#~0B;QHIv5`C_k@V;YV%vBhV(%#SH8L;26|4ix2l^1* z_Ra!1ls{Bh(Y(I$F zJC2>&eR$uQ9lOt*+;?K~?^1K1C3j@sJtueUJ9c!>!5zOu&do47xw8Ia$mdQS+q>)J zz8!mZ9oc&*DBY~mtUf-GRv(?Xq}rRhT3e>%Kc|hH>N=fKh0~9!k50$cMDy3wyQ_Dq zPpKQoLgA-XS0L@{SIt%V5? z+%Ui@SL+9jQ^rPPw?S}CwhwS3BAkjk4kE)1QO`}0}~*aQCC=uBMV!aYMXo(Ovy5#BpACkE&wX<-8|5yw><%Yld2QwjHleFlha)W6 zW^Q0xbk*(Pgi{XO;3j8sk37sn0a|h`xA6%FH77u>(Q)N+Nkqa;$WiR5z|nB!IOy<~ zW{eXL?aB3EVEuY^ow~DiaKhSt4L9HaS{zhEnjmnSm6?2+( zZY0rRmf$AX=x_gQm&%>OK-^LF%>j9vy4uzptG14WHJqWT3H8G^zl=l4SQy*Ip+vpi zKDw=)%$aeP(&R`7`b#{T07nnW4BZp2suS*TK)(%_#XieKmNi#QVC>K)0!xs<{-Y(= zp_b=dZ{AWz+OttKh}7!_E%ju3+nf#HYK3TJIOMI`1$^%~yg4(%Jj>|-4_^v1k%li| z@?YD-v}|A{18r40^`X65CUPTSjI1hbgo3W1g6x19ReHS-Gj*#Brx)?+6VO@Z5V-|r z-KcDZ+0_d8P@F2~qNWdXbOq;BRL`kx&{dTqr4V$hR|-eVp6^f`Z_m%+x=fqn7$MmD z;1$RUM6KG$+fm=4o3rum|aMmNwVG8_bK; z7LDw(x;i6Njt4HpOBRNcM)L{e80^W4R>hu=EQ1^7Rb-j$T7{Jiw2~zxant-QWHE;M zhn_uk0jmyKj5G81kQHKYOlPH$72+ZDkC0_;WA9dY=|D~MEN+?aAxsoJ1UVSxG;Ye zSuXqLbXE*mE_cmmkma%GE3As2G4->VezsE97If_UeH4@IO{fg0YVOQXUoGg=KIrDO z4?5WWJ&O74!-`m4z|t0U(EBN}66_b#S=xsLPne$|E6FYxl~D?`V(P_COoMQOg`(O* zil?AQ{bgqh?N$HL*;}5A6F7!07UdeD_irtym$nF&E2q>FdUaE|3#WJ{0rT{PkGV7m z&Sr=?diB~JD4+u?@j{-RfcgKcP&fg7TBs~P%hcMykduItmiZhJo`74lNb<9+phKky z2856oPw4*3QRvsgjnm>&nOb2CYL(u2EIz$Afhvw`MRma!XveP#FTA;(U)D@nZ#UY- zNL6*w7icF@6(0Da?Npm_tD1va6Zdmka)b7h7JSzlBG&pUZO-Q1QbAv zsVRCC>FP&w8p^UNP#0LpqlJ3|$@G+D3%Vn^P0vXeN)H@b| zam)sm*SQ22D(>}$+>DV@|KEkdl-x)Km_vEU0VJrGx*~MB`hHhSD;UU#BrVO+ixk%FO&+4w)Yj5?z~8gV>?INR}_Z}7ij7{O)V%a-ak)0a3F7b zmQB^JOTIexaA@+41Fe(>$FIpx5B|0De>n%yPL(@VAHDgUq@I54&;LJ1q+N8DI(K(g z-fXWEsjceF-LI;*F2^RHxaTmm{RTB&pvJeU(PRkK5jaO*R`MFkhqz25Ryn*Q_1&1 z9uzS$g|w_0mVoroEEn+qsOy)s(4p&~p#F=Z9;#!@e51rFZm0?!3 z6(Y~V>}rL}AtK`jMLvY%va4Q`vda>!+OEK>e_E7cZQx%Eq6Xj+2Z5WUxXrm)@XX~HJYRa zuV>Rx4>>5nAPm7`SOQx}o-868$tLAocxmM-y!Rz5G_2IHLBoWGQ4MP~jA>Y>VO+!N z2*Oeg>veUxhBX?NDfeOr-K^$cd^XWT2_Nl7Sf*i2!+5v)>BYJ(&6&{kH5%4xSf^pV zh7Aav+0Mo}O+{;FXR$atJ4+2;s?*yUncB`Ab@tL86Wv5bW!u3S|j|H3g4Vx{gVm zqi=$`N(P?y$dq!$ZFvhG%TQF@=m`e;evCA-OC9}cy4+P_pxp z-iy=_Mj@&R)ow2aS<9b*SS?`{#A^ww!PkWHjYc*>qE=)rBx?y{kg6rDhq_wAa!A(_ zHbAD9umb8eAsAomZCP)FYalzFrb)}7p;m7rG}aPULQ^ea9W>Vx#v!K%wmL|C(4wmt z(`2jchCGHrzky?0ZGt-(FuPQb>L~XDegLRQwHKjHm-U5GJG5(geF=z%h$!_-Awl(l zd?|)Vibrw0#L}q+#iLgc7j?5yVnNA*Le*fa>5vkxgeP5i{#t{5mm1ef{ciDCyXS1M0_D z+cPv|JJdk5@KXuK@Zjr$xc)`r(}Qes@aZ>b!mr6n?>Mw)2YzgL_1kj|_4@7+6`9CQ z-Rq0(Zqb2y2l9B0??4-CHtG!DfszAV4&36v90%q)Fy8?RcE6D{8jVh4ma)tjH%1Kr zya|b+a|W0TSlk%k5y}=JVEiYhtoS9&0Zcz(5@UA^G+rmJt7|y!V(!O@ND5!XL|Vi}od^p@L_}2Jt}F!Jn@2IXjq@~a-x95O zcpo3b+xaA3S38a+BYh(4Hn>?CZ8q1i4cY5~18i4nr*(X;ATN ZZHf9I05$N83(=5|fS1zsYSp!W_#bDzh%NvC delta 7792 zcmc&(X>c6Jb?$yMy)!%AJI9{b1B+vEECF&s0tB%H4}c_i06ai~H)-<*MT!)7Q=$&8 zcS**BA z$u|E5z>;C?maN})w?FDc92MeFi{4);_LIfpE(6mB3_$^(3gXP(K z>>1to&)}<3^Tq70z~zQNq1K-_UZdjurvFKY-dix=`NBd$9-|P0I5a~itb!A85+0`H zFu6i$lqTf=daL<-LJ8>yjgXYw9G+9E4>3YE+Xy|5OGvNd5i;Eg6Eeq%5Rz5U;Y119 zqM)d%qY5@Cc$zBQ=EMlus$i}HNfj=3;)Dz-SgK%H!Ez@-$T9^>6pSb+t#;}N8FZ3_ z99M8q!7&9-QHA?;v}~;^ty9pZAgN$|Dow~;PKJ=KdbE31*2QtnY*4tc5!;lS5FSu) zR>4D5;e$S&R>kvv@g867f?qzP$d~-$eX4koHY47v;G9prTTw6j#rsvUA%O4*^$;JW zImEovLdd*UjnMuX1p-gd?j$8zV;`d$n>Li8W?*}fQDHRoB#E)NCrr!*+1zvz^tu=c zrWIrc5oWX`NwBBICBc5_MrV~4uE-GUNxE==@QGX}5l4q|l!WS*4I#D+_aSyK!*PdZ z`?!*|WBHCgM7y;!PwvXyl^>n8cFvf&cEP$Oz4_kU?ELK9p}vEC6ZwhU;ryNX!?`~DF2!+{s!?^{dZ0L)2T^ZCU;$r%A?m!`F`{-^*A$K`BJQ<-2(1V)AhmBYc)`$ z1_^RaI{8uTuju4=5?vs7ObFSP`tP~PiSc_*?i@dQWbc8UcON-^X#Duj-TU?(A3t#- z`$^8xQ+p1LpV_(R%*pW+@`)8KldID20&SGnjwj{L?B!y^siXULpB&%0clX4;gMR52 zmA`;5y_0>kNnSmflK=XcA+Mag(BC*E`bi_E%&YYE2?6;|!)rOaw&TcDwPpajcW33` z=Qqipf60@(d_)7@aYPve9x z$CfT(|Ei@ z*&)`XMKlczRaeym+9_?LwnroAGTMeX5jLkH$wAa}O=P()8aNY;JRq95A)2`=EN|eAyoopS9Cx_OJs#!} z9_LXW;|X5JQ#{QxVFDDbnf3^^gNr&0uT|%^1~ zxW0<5#aT9j?Urr0t@=i`RaMP)D`bRQ^&M=FsygkQaLR#eT<6TY!#lzQJ{sOeZsHU4 zh85BBiQGq_&~m&r9uWyU;f>%VgmA7LZ#5_%&KM^SYV|gQR$bjBZ{!9>dAp?*y!8R} ziT+PqFv}O`%+kEwB481hc-!=5MfG-KjYTazjx`puNWtso#0|JcRN0JrU?EO$MAQ)S{+4VB`}5U*EW!bM(W|s`Esh4W7}vo>d;4eD)Y~UC#Jv^UEb#US z!#0Y5_6000p%kEDJdpT=VJN$SGwfx(n$+&FR%G0Opqhz{1#0dY3!;fQ_t?e$C@NCp zY0@Jsp~$ve*_vs$(1$5mn}t73Hp3drvR7M^eYm<)D$RCWOyX!U5UM{kuHZQpCaR?B zO_)+?${)A3c5MM$NxJ1p@^+~f({PFz8WduV!P~*XrD8hLa9Jk1+k&*DDgieItrbqd zO+%ZiXvoO`y7_Vo8ijnNOuVfyt-8`N)xetuofUe06s9YCm_LsC7|f_}i1!&Nlq>U; zDW8R|3Janzvr^WhFiVy39dy+@xC6Q?EK&?WkNjc#k&+v=C=S4lHlfo<>cgf;vGx8s zgv*>Ta#B2{Z!txh?WyKOkdx+V{SH%P*fF0IDYsFa4A1DNO;OJtq}42?uAbNHm#8VS z>`K1OEH{f54fI%99UZ99*fV8T%(pKl|1BRa)%oSRqA7H)>o21iW3QLRQa&q%EXJAs zhsX-BuUE6u$O`a){!L^V?5#2@?YB}agB$vHk!7+URd1YFv zRJJTs3<`@|`p-~;v-98&wrr?dv;^l|e+Wz=*b`+|+0Zbu1Q+_RAhXN7y zURj{dXDLI`z3LwzE6V<<%u4yJuzbEFy0TnW-75$Ca}@7a0($-;->cRLeMXYD4>4MwnCpOiObZ10M7CO)J zEPa~dP{pKy+t3@Y2oK)A{iP%R0PITBMYqvUq9VNb_WLP!<5XHMQ7v6gizVCdzb?k1 zSS}_jGDAw{R?pAz8^)z_QQj|j73rl)+Cq(GEvX89nWBepS<5Lc;TSKKSA2PG>vW~{ zieJ(?QV|+fLQkM!1ut84bnHyMOhvU71ssgZ$|gtsUB3YZT6{*#7g!N+LKTUaFVTn+ zb9{;TlnT2d5cdU|P+)~GkeCv1P(a=&)R$Zg0ewy#N@C~9V%Zq4LQnb{T8f^2#urFU z34|*GDPN!!1s*S(ot~12poIUyrDN+N!x=VjFSe3gMps-JSnw|^j(wN8IGX6bae8YY{YyNcluE0Ap4q0C>928&edeIHN zJ<#F&Y(OUqAO&g2LI=!))vy*$!Ts<6{2ql#N+!rL@&YBlMafqvT|-}|MCdpWd^l#C zL|{OyQ+ajIOQkRR`REsXe8$Hw`*_XAOFlm9<3m0^=i|dZKJVkBKK>>R``N9+FZquS{KGWy5KSz|5AE-hbbn5F4UDUJ&c`nkaln|OE06ZajUcgY{!H&{}pZHBN?TW#$=h}=rr z1JPSadm(l!=`h5Rw6>hvfOkS@7Di_nYiR|HrO|F2*fB^{nw1F7ma<_x)O}jJJ8Ih{ zEA1-HJ`1U8(h1ab0MgYYrF;ius!2-fPN-L;QuUyBK^AFiJ%92vv|YD!wKCp8t{2qO zp!E!`Z%{4E3#lpNQDP@Fs;0LN`%ta#tg73623q9H4_v0L zvghp9mZScQex3@?P84knuRCPv|x+h8y(+vqE%fL8u%9-|9u)CHw|Mx;kqpMpSc( zHq5A2b%8>m(hc#>QRu4FxVIQ)%EupU>zh>}g}n{XeY3I=dQ_$Sol)-$%&zc=Hvzr! zCl4;AOJ&!&k!{x-t2XgQXxyZoep}POsk`hQ{a-ZW8|H_$`C4LE;K{lX>j!nF_@M5; z0-+x?=+2KDbkdAx?@8Rnn;;JZFbIob32Y-dvVd$RTjY1oy|QTy9_y1;3RWxFq+nFR zQU&W2ELSk5V1o|=DK+Yt)Sm+w6O zeY#z~dL_>02+Qk}Z(hl(RL5&qn@Gt&7h4Dz3K5D6?WtUD5HwXqXR4|NZvp5v^#Nd2 zb^M|iL!g$h3=BoU&roULQ1BLkc?)GJ1gXA=P|P8f2nLZBe#u^UQNvW1R5eE5KM!+I z)F&$XxQ08xeDpM4xBTm?$x?Tbfm-6~9+!Y!Yg9j;6x|#an!N&CMW_sW2)tVU7=&vH zYavogSO-x>C{0Zj>f8pgT9Ne-uO$paqL#1`>S_rqAz4e<1gToWDo9roN^0xPR8zoP z1NDmV@e<%HZieiwq}9+++iWW|))Gdcsg|$-nrjIoFaz&aZqDOeXi-)4f?k`~1Fg7~ zM)BO+YZu(I)QTN_vOU!cZAkZp@&#yDWeg^~Jmlq#C*$*%qYI^Y#HY?MDFz$(7WsZt zEtX3RC>qdFY2W6}_7CW$dMr+APrZwm0TKD5FDCo{0*q(%pP1%Dp;N+hLb9;>lbbaxe@1&Jxl}+Q=XoBFkwvT}X#z*R>`4>eS7j2MDf430*~l7=>pW z8u5y1dMr+~MHsnhi<>A3WLSV0bsi;V67K|q^Xe(F9Gn+xrm%=LFN;p1DV-s_J!BJ+ zPNpycnO0}xeN$e(b8V5HuuM(XUvFzrmq9dOT2w zY^~{*dlTa`B7Q(K1D9!oU<+ycUAsRnvKi)agYh_d+zxGxZ*KPvZr zxv3PzQ{w=~wTrPNH>d&acz=-`w3LYY5gA)s#D(>7$SXot$g*|zzWn}*gtuYLI(H~`a(grsWMZmNClsx&u G-~S)^0r2nu From 4ae832aa3bfd460323b18993f2628b9aa4efee81 Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 11:24:45 +0200 Subject: [PATCH 41/62] fix(iota-framework-snapshot): update snapshot and manifest --- ...000000000000000000000000000000000000000003 | Bin 43154 -> 42425 bytes crates/iota-framework-snapshot/manifest.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 b/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000003 index 9830507bb7cc1f2e69a926f862955668fb430c93..c1a2b18de428b8c992029404e203e02d888bdf13 100644 GIT binary patch delta 7286 zcmbVR36NaHdG7w->v?Zp_q;bf^XA;ybM_c%SED^7?XZ&ekXEZ*U8`dybYNDuv;C)ieowsv-+TjJ{hr+Oi{;Pfe!@e95J5>ZG>;oIubbvGtib-5 zJ#Jd>hTnSXX5Ha)92JrH|PU*l1fF#?7|K8taTz#)yGD0Jhb(9;NIUYcb-6 z0am$MKWdyZwj28mf@`vUkP{K%RHQkGEH^|QH${#!QO`r7fm@=H+oFkwh07h`aW0}I zA|yUBeB$`{B`Om5B=JdcAu>F|(>%-Tc#hZe2Hwblz9^-MI;7Ok1nHT|z z9xS-m4Ua6eqHQL3ouD8*771fxo|$lYg%V|{u!!=g+32zgMY86wkX)Jz+)#xQW1V3U z<1w?(wJMZ2TN)N|9yeFI_Q=9Awjq2r6c#@B%~foSyVSBfoQUPMnd{l4u38F%5{>6gqx6K*inI_;mQfn;V;7& zCm!09+rYs3mFiY?v2|$D>2QpqoD5-X34TezoIsp2$B>^AA%{eX++nt8s@#J$<~wE* zYdEV&QFe0@4MicYd87JPTT`ssIubT>hNdRfzqR>g97@K**e(tw>h1T@ zZS7>U8D}X?j&z{E#G?st^pGsjJ@KkK;SLA%+i+RzqfF#jQ^f?v4s9Z^1PSavT5=s~ zdCryQE%kVNE{X<`dc~lney_c4@f5gPAzB#@d4qNV-#ZR(vl(HY<#d3DFNK*%!xu2? zc7$o!z)BX{s&wi@d$mmDcEA`}RoD&%T|oue0Sl`1Iv*D5RvAt&;?*Ufv&tcICv;t{ z?1Dwr3iwc*D>p|?9~SEh&Z(%LQ@f$NDo08o=uz(!PLw_0p*Y^2-;C=rV@_a%VB3OM zAS)b+oGj0pJ8eDW57KF<2z=e3p!f?`HK7|~EJzdeN*z=KPaKpTeER(%dVI>2tWC=;!G=B?OjA8zv zXHPm{rIE!rGrx(f5c|%2Rt8xi9y0#~S=Mg$R)v=d)HKiHmiaF7Z1#8aS=yq_ZSy^3 zh1vTRR>gZ!3X3ogoBxa~hyAR=^3}5ovpXw}dL>72&drCx7J^;E`FO=qi7df|`B`MS z?2GeRF=V;iHJ?Y8$6l_mDt^XPwA0U3%G!dCeZP-ll6@B{1FD8Qv(#66I<*hFIqicE zcK?WCKKpS+EFG}41s(MM1z8F9!F-nXA;A;o&ykg6=ZwlI1zIunW+$dWIKe_uZ6U=| z(5wEVvxWAlOjlod2~OY`x>%H(h2FoloL<@@SgxE>OX$^2b^@0DuR`Gj^lPEA{3ugf0z*y$N?PV)M0f(O(;~@_vVsnkA{Y=t zUOb`uFUMd&3pdP*Pi1O_F{o8~AEvDw^ zQKYL67T1?$RUjQ$$fJe31If&sWDEs@NuNoudvOxN*xW`?ip#aImI4{qebhS^feFk8 z)}>v73l;ZzLtc-OQvctF!IWH01(-v5$N?m%x4I*Ao%;LkmR3qk0+=-7E=XcTkO*;c z+XYHVfh;B`$YYdTnr-hn-n-)c!FgxOA`}lAPthMS^TW_`_I2xDL)MG#EA{r00b`HGr8G~|7i?nqGrvvdmgaClvP_0aG3Z)LiCuyRj-Va?w2v^c(ZtbKiPq;QU=9-^t`g;j@_s%MYnP0zBa zI(xxaPdpr&{lSq|N`vFqY~#$|I{%k*5babWr|P2Do|DwKANz~{&k<=K?NZO5$;oT& zbt1J@eg4dA>W3F&v#;HG4BCE!8m~~}OVsGJ4GPf?W2Yj2G0Z zdqx-BA#B%{$Axuu1{*qu<2GiZTQDEBN+evOC8~Nv922>aT%!K;p62aK@C>3;^RA5J z7Uk-zsXh;J3zfs%!Cf7bcuec3@I;~$W)BnkJ8Kj8yTQ~eEQ32BktfyAz4`JPV4Bnz zkdBRX;eU!bTf3R92+h@7O`m0P&Fan4K!=0l!CeqS-K8F`a?I>3Dj%enAYsKd!type zi-6n#)_f6|Ct_=nGRo`>vUV1#SVh7;5Y|3f0RiN#xba?JNxSU|2?H=D&+>GTLAyc^ zhhxe<9U9OR1IN)srqD*NTD=z{nxJzKg4zG=xUma9Tq8OWF&GYe`2TiKNYyd>`Zq zVK|1)LGajw$tLy!dwC0_s%m9|L#KV%4e5{4J5;Nesp?hLZh-83(h0P580zMewDC_t zP8*lOs2J#!>6m)_<^CRS7WErIzZm*euQe<0%g}D2$S!Emx>q`+esI6P@fK*jwv8L1 zsYY(D;|FUy(0r}h9%y;$feSRR9)4ig#+!rbd%uuws^nt2ndb2no-Oo#9>x6$=l^jm z$^=j0a*4QJ$xRBKNO4>@PEii({WOL<4z4e`SryObFdVKwds8TnZ~le>_2k}!di!ja z4ym7lOR5YkxnvH}rC9o%8Q0TYQ-M%TVOc8%*!r29vbl z?Q90>pcx7<1jDcjR>Mw`Co9QzvO_IA_q7ch@!FTH*RVmul!i$SV;Z(-7}u~>!-R%S z5rj1ww(06R4VyKrRmJli^m?`9{0oU*O88h0!deaE8YX&_cOl)aIg`4+S;H0$TQzLc zFon>W>ugxuShN;)7K@8=U25NjwBF6g+-~NmXDMMcGtK)(mhEOeG6f8}^$SvD$)J+%V5ZG5p70PM|YYLvKbRBa# zM_&YWmkd1akvZjx+wwX*m7%D(+7pcP0~lyzx4QIXrrcd(pxp zUW?Qa#vrN*)o!l>S<9b>TOFi+Xwg-S zX|h%JKpw-OU(d0vHo+YXnB8it>L~XC-v3vm+KbSp%lba49on_Lz5~QFM3nlakf8cJ zz6L`i#gjPRVd>0*;>jzBi@Mn;v7lr@p=z*I_6FBdb3QBs%^>w;guIcM3p}&`slMmH z&tvKjpUn(>7p$kvf3WQj#NN;c~*o5CR7A2CzScN&9u^PuHRL?@h%1BD= zEPf~ouc)WQ@$dtM(<2<>tZ2Y!(NdQqyby7T$YrvWh=pkvKTa%A-?%&yN;<= z?p|N)af=SrIgrO|d67 zcoPys?+h@Pv$!$HBb2Q~zzu*9^AWZ4#pZGXZ%acw(QGDIhFjEv4!mp64m(;z|3tlO zj9_MZCE*pW<2pQV-ryRJyNdg9B9g)vF_95*krrX$h=_;^+?IvFd-EvfwsD@p{ad0H z5AWk+csrlO>uSfbWTao@+!Hl-b)9g%vT8+Eul?}plCEfLCXq0c-BjBZU-RvzdwbB0ptmuMi delta 7792 zcmc&(X>c6Jb?$yMy)!%AJICG^7FaBf1wbxH@WAo_36kIe@Bj!N;$e#vNl>InkrFS7 zqQxb}Lx*)xYA3N|(vBiUi7kmz0!fJzms4_FP9;)gD=Awkr?o#WG$XV2)ye*|BNnlI#b1}-*#n_Ay(xlF|e`Tx#@-XB=#JiSPeFH(p>99p3V*1%CX z1`knkkUU0dlqO_zcr9N@C?WGfBP1>F3D2!Gg%}~X*a)*6mykJ*N60iMOvqd(LP$Soh%`}O=$PboQva{(X4P$3%04` z5$;!TTET-<;Ta!KsNw^D@m^o-oL@ev$QS(LDOEgATM_S5aMq{Zqo^1C;ulo0Ie_pm z^$;JS1;nD$M#zG8jnMhiO9Y;veJM(`mVQPx)-{x+W?*}nQDNj~rHHY6R+yLrxxzFO z^m-WyW)x%x5vI4LNN`r0OM>&|jOfhDqE%U9U80K?6Mm@BL&RM}1xiB66+?(^!~KYT zD{$PQ**>mjomjrTAJJ~_DUv%2cNRxyj?Eo6#|G9fn^T-qm|dJ*IMBbp|4{Kz;b8HO z;=#flg?-d!7F2&t7k`8JtNyzt{^`^tE|X`jMCGL`=2Njh)#J=`7*Nfi%$M)q8H@pLqd+Ge>N|5XyV>uJ0|WrynEk{dk!BtFmYtZZF}|{ znK*hh_gT(e$9El=IJslj$zu~og8 z(|EK(*#VZU46#DF?1`oip!t?=TPeXn32r ziBHfQRz%Auavz04%kkEEL?rBlH-eK8!ntz1wV*sWW1Kjs)w>0>`s!x+Zej5#@3gd% zw;_NY(f^4HX8GcrS((phEQrF4T3L_6OjX8r&{gl?tl# zxAkX{<*=_;Sye+7%i)fG6)#sJx>)J%G*vmslC9yy_28 zAj00S3M74&G8Emb{vooW>?c)L+GmC3o88gX)w1edIoMB7EY8kr)yeb46ia#9$MCJE zoZ?(0*so|@y;>Rn3sL4Jcmih2mY!BRM=tA`#pmMd9Zp%azK=%tw*RFO%Uh zSfJFzZ=?n{fpQ4lM!<>2)M&jCSg3?^*EyY9TZcvJ2jjOCu~}112X3OD*i=7q#`I{# zLho6fr5h;@)l6D^6MEw{;lZ1?zjD|gfL&|4*T54)}p{n{Jvbc=k?SmBhFc>@Btss`FNg=OLrncM`dxMkQhhquln>~^YP0H-Ph&V z#G%NGbWxgkFVjT{;=SVI8}i+W`23X}3yX`2D>~MfMmmN&)|A$j#!925)g23p<>LI} z;_dT_D|bFjOCvj1b*wEdD?UUM57NXyacFP9%&bsE#YqO^}?mN(>nwY2g7H%09_zE6Jp_A>$!nhXx zYbw6wrV7yI(Zz_42mbRRdw_N`8WV(b2oa1fA07E4Zc$VOOp)sL3 z4Z8YpQy2^o?_Sw=U!igem?Aa%q{B<5;eYDt(GFb&6DTxQZ_}eJT@4xx4O1{bUAi9v z*mjPC4hADvgL)UKK&RjkTMK%}F_{2w3mEkxP$yz4kqXLe^RpNhsA@$*rJ8&gJ^{RA z7))#hOPOg_N$C7Bney&KAjB3bAGCCD4hEIV5)G3X9hrVcaZT$P3L&KfGc%W9&T|5z z6(Pq@g?lfmd=e8X&#C4X*3^IqT06yY!9hPa*liQp^o^%l6NE)jqH{cx=nuXyR##&klgK4xI2X;3kYRxJHXG__z9g;U{ zcY9;IRIOdD+2TG_=kvsR8qp-YwV zOM&hhF%X3wRjy@)=c%7&?#Nign=NSB6S_^y;TAo?tPovZ5-Q2Sw|a?p0l&eJt_~Z@ z5!IZc4b$sYoug2ybwj+f6nbkl?k$BG@})B!{WEK%u(uKVu2nX{ELEv~XVg0hvuix! z9fCPBcy>8mE=SLfY`fA@w~4nv%VzDw4>bLIy32l~|5P)+V}4|tuO@Z|E+t2-A16)m zVe&r%p&vKv&fhfaq!o|eQ@D%gp$Lm%5SGF+*hUIufZRg1$bUO~b@Mtr)hBBdtW~gC z!Ki}e3f3!FsbE~eDg_%Aj40R;LKs%CNmW-X7*nu9{__K!bgPV=dp?FaIbWe*rGixo zhWq3@=aL&#aa6&Wg7pf<6>Pw~oo`g7O$s(6OwUfw&1{}wOzW9Z>dlsNK{J47yQZU3 zFHO@hX*CTqNL<-_J|$P2|2wr|^4jt6ny6mv)=fP`bqa1-YQ-*H>P*jp4y5}+#S(O?G6oY~5sLENOYwy((S=ex<5P#26oUX|XubmSE(jEzMIB$g%)2k{%^y3a@1GKdCDi)x4l-hQD=_wR$mr`Ji7m#+L7 zojm-t*;@X(dlTE@$52{_X&NL$c~*CZCSv1Toyl`ZJE zpx1)c7L+WQWx*T^M$iZ_=V>vmN$b{nv=w;ov0MYdEg+1RYM{?&5p95nC|iht`vM{Q zBl6sH`AQUzjRPFlF2+*apayi}1x9MnQX=X{WNmE;7uKgCuLxNo%PQ!%+L{$w%A*k? znnX-QgeP($ED|Cqf Date: Thu, 24 Oct 2024 12:02:59 +0200 Subject: [PATCH 42/62] refactor(iota-core): Rename PendingCheckpoint to PendingCheckpointV1 --- .../src/authority/authority_per_epoch_store.rs | 6 +++--- crates/iota-core/src/checkpoints/mod.rs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index d1272c007e6..89a507e2de7 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -97,7 +97,7 @@ use crate::{ }, checkpoints::{ BuilderCheckpointSummary, CheckpointHeight, CheckpointServiceNotify, EpochStats, - PendingCheckpoint, PendingCheckpointContents, PendingCheckpointInfo, + PendingCheckpoint, PendingCheckpointContentsV1, PendingCheckpointInfo, }, consensus_handler::{ ConsensusCommitInfo, SequencedConsensusTransaction, SequencedConsensusTransactionKey, @@ -2754,7 +2754,7 @@ impl AuthorityPerEpochStore { checkpoint_roots.push(consensus_commit_prologue_root); } checkpoint_roots.extend(roots.into_iter()); - let pending_checkpoint = PendingCheckpoint::V1(PendingCheckpointContents { + let pending_checkpoint = PendingCheckpoint::V1(PendingCheckpointContentsV1 { roots: checkpoint_roots, details: PendingCheckpointInfo { timestamp_ms: consensus_commit_info.timestamp, @@ -2777,7 +2777,7 @@ impl AuthorityPerEpochStore { )); } if randomness_round.is_some() || (dkg_failed && !randomness_roots.is_empty()) { - let pending_checkpoint = PendingCheckpoint::V1(PendingCheckpointContents { + let pending_checkpoint = PendingCheckpoint::V1(PendingCheckpointContentsV1 { roots: randomness_roots.into_iter().collect(), details: PendingCheckpointInfo { timestamp_ms: consensus_commit_info.timestamp, diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs index 2b8051405a9..3058fe84b50 100644 --- a/crates/iota-core/src/checkpoints/mod.rs +++ b/crates/iota-core/src/checkpoints/mod.rs @@ -104,23 +104,23 @@ pub struct PendingCheckpointInfo { #[derive(Clone, Debug, Serialize, Deserialize)] pub enum PendingCheckpoint { // This is an enum for future upgradability, though at the moment there is only one variant. - V1(PendingCheckpointContents), + V1(PendingCheckpointContentsV1), } #[derive(Clone, Debug, Serialize, Deserialize)] -pub struct PendingCheckpointContents { +pub struct PendingCheckpointContentsV1 { pub roots: Vec, pub details: PendingCheckpointInfo, } impl PendingCheckpoint { - pub fn as_v1(&self) -> &PendingCheckpointContents { + pub fn as_v1(&self) -> &PendingCheckpointContentsV1 { match self { PendingCheckpoint::V1(contents) => contents, } } - pub fn into_v1(self) -> PendingCheckpointContents { + pub fn into_v1(self) -> PendingCheckpointContentsV1 { match self { PendingCheckpoint::V1(contents) => contents, } @@ -2727,7 +2727,7 @@ mod tests { } fn p(i: u64, t: Vec, timestamp_ms: u64) -> PendingCheckpoint { - PendingCheckpoint::V1(PendingCheckpointContents { + PendingCheckpoint::V1(PendingCheckpointContentsV1 { roots: t .into_iter() .map(|t| TransactionKey::Digest(d(t))) From 158f2fe7dfa49af5695f8645dfc8487969975ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daria=20Dziuba=C5=82towska?= Date: Thu, 24 Oct 2024 12:18:54 +0200 Subject: [PATCH 43/62] refactor(iota-core): Remove assert as randomness config is already removed --- crates/iota-core/src/authority/authority_per_epoch_store.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs index 89a507e2de7..60331ecdf2d 100644 --- a/crates/iota-core/src/authority/authority_per_epoch_store.rs +++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs @@ -896,11 +896,6 @@ impl AuthorityPerEpochStore { randomness_reporter: OnceCell::new(), }); - // until randomness_state_enabled is not removed we need to make sure it is - // always enabled as depreciated versions of pending_checkpoints and - // assigned_shared_object_versions has been removed - assert!(s.randomness_state_enabled()); - s.update_buffer_stake_metric(); s } From e5b09e0f75a8c468a948a2e7b4ab89e105ae7439 Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 12:47:34 +0200 Subject: [PATCH 44/62] fix(iota-graphql-e2e-test): update baselines --- .../tests/available_range/available_range.exp | 16 +- .../tests/call/dynamic_fields.exp | 64 +- .../tests/call/simple.exp | 58 +- .../tests/consistency/balances.exp | 16 +- .../checkpoints/transaction_blocks.exp | 36 +- .../tests/consistency/coins.exp | 218 +++--- .../consistency/dynamic_fields/deleted_df.exp | 86 +-- .../dynamic_fields/deleted_dof.exp | 18 +- .../dof_add_reclaim_transfer.exp | 20 +- .../dof_add_reclaim_transfer_reclaim_add.exp | 24 +- .../dynamic_fields/dynamic_fields.exp | 336 ++++----- .../dynamic_fields/immutable_dof.exp | 22 +- .../consistency/dynamic_fields/mutated_df.exp | 52 +- .../dynamic_fields/mutated_dof.exp | 30 +- .../consistency/dynamic_fields/nested_dof.exp | 32 +- .../consistency/epochs/transaction_blocks.exp | 216 +++--- .../tests/consistency/object_at_version.exp | 16 +- .../tests/consistency/objects_pagination.exp | 328 +++++---- .../consistency/objects_pagination_single.exp | 150 ++-- .../consistency/performance/many_objects.exp | 132 ++-- .../tests/consistency/staked_iota.exp | 22 +- .../tests/consistency/tx_address_objects.exp | 690 +++++++++--------- .../tests/epoch/chain_identifier.exp | 2 +- .../tests/epoch/epoch.exp | 10 +- .../tests/epoch/system_state.exp | 18 +- .../tests/errors/clever_errors.exp | 40 +- .../tests/errors/clever_errors_in_macros.exp | 6 +- .../event_connection/event_connection.exp | 24 +- .../event_connection/nested_emit_event.exp | 6 +- .../tests/event_connection/no_filter.exp | 4 +- .../tests/event_connection/pagination.exp | 18 +- .../tests/event_connection/tx_digest.exp | 157 +--- .../tests/event_connection/type_filter.exp | 16 +- .../event_connection/type_param_filter.exp | 38 +- .../tests/limits/directives.exp | 4 +- .../tests/limits/output_node_estimation.exp | 26 +- .../tests/objects/coin.exp | 38 +- .../tests/objects/data.exp | 325 ++++----- .../tests/objects/display.exp | 18 +- .../tests/objects/enum_data.exp | 244 +++---- .../tests/objects/filter_by_type.exp | 37 +- .../tests/objects/pagination.exp | 67 +- .../tests/objects/public_transfer.exp | 4 +- .../tests/objects/received.exp | 2 +- .../tests/objects/staked_iota.exp | 26 +- .../tests/owner/downcasts.exp | 2 +- .../tests/owner/root_version.exp | 32 +- .../tests/packages/datatypes.exp | 4 +- .../tests/packages/enums.exp | 72 +- .../tests/packages/friends.exp | 30 +- .../tests/packages/functions.exp | 38 +- .../tests/packages/modules.exp | 48 +- .../tests/packages/structs.exp | 62 +- .../tests/packages/types.exp | 2 +- .../tests/packages/versioning.exp | 64 +- .../balance_changes.exp | 18 +- .../dependencies.exp | 61 +- .../tests/transactions/at_checkpoint.exp | 12 +- .../tests/transactions/errors.exp | 4 +- .../tests/transactions/filters/kind.exp | 20 +- .../tests/transactions/programmable.exp | 154 ++-- .../tests/transactions/random.exp | 2 +- .../transactions/scan_limit/alternating.exp | 18 +- .../transactions/scan_limit/both_cursors.exp | 8 +- .../transactions/scan_limit/equal/first.exp | 24 +- .../transactions/scan_limit/equal/last.exp | 20 +- .../transactions/scan_limit/ge_page/first.exp | 20 +- .../transactions/scan_limit/ge_page/last.exp | 16 +- .../transactions/scan_limit/le_page/first.exp | 30 +- .../transactions/scan_limit/le_page/last.exp | 30 +- .../tests/transactions/scan_limit/require.exp | 82 +-- .../tests/transactions/shared.exp | 16 +- .../tests/transactions/system.exp | 300 ++++---- 73 files changed, 2342 insertions(+), 2559 deletions(-) diff --git a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp index 1a6837056ef..36b75b43656 100644 --- a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp +++ b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp @@ -6,20 +6,20 @@ Response: { "data": { "availableRange": { "first": { - "digest": "AMwdGDcyNcxfCjDRN9y9AwYfuHHVrzd55rHKpwyfBimJ", + "digest": "89B4wYQte9UUahKaD5yWbbMJMeiAqKHp7PykK3oVZUiT", "sequenceNumber": 0 }, "last": { - "digest": "AMwdGDcyNcxfCjDRN9y9AwYfuHHVrzd55rHKpwyfBimJ", + "digest": "89B4wYQte9UUahKaD5yWbbMJMeiAqKHp7PykK3oVZUiT", "sequenceNumber": 0 } }, "first": { - "digest": "AMwdGDcyNcxfCjDRN9y9AwYfuHHVrzd55rHKpwyfBimJ", + "digest": "89B4wYQte9UUahKaD5yWbbMJMeiAqKHp7PykK3oVZUiT", "sequenceNumber": 0 }, "last": { - "digest": "AMwdGDcyNcxfCjDRN9y9AwYfuHHVrzd55rHKpwyfBimJ", + "digest": "89B4wYQte9UUahKaD5yWbbMJMeiAqKHp7PykK3oVZUiT", "sequenceNumber": 0 } } @@ -39,20 +39,20 @@ Response: { "data": { "availableRange": { "first": { - "digest": "AMwdGDcyNcxfCjDRN9y9AwYfuHHVrzd55rHKpwyfBimJ", + "digest": "89B4wYQte9UUahKaD5yWbbMJMeiAqKHp7PykK3oVZUiT", "sequenceNumber": 0 }, "last": { - "digest": "J1FHC69SWBoxSNVUVMKxWZt5jzZACEiFxDgYAj2MuNP8", + "digest": "2GNBAASF6SGKhLs8rHmu8fBkE76fN7j2TgK5Qmrqkj6F", "sequenceNumber": 2 } }, "first": { - "digest": "AMwdGDcyNcxfCjDRN9y9AwYfuHHVrzd55rHKpwyfBimJ", + "digest": "89B4wYQte9UUahKaD5yWbbMJMeiAqKHp7PykK3oVZUiT", "sequenceNumber": 0 }, "last": { - "digest": "J1FHC69SWBoxSNVUVMKxWZt5jzZACEiFxDgYAj2MuNP8", + "digest": "2GNBAASF6SGKhLs8rHmu8fBkE76fN7j2TgK5Qmrqkj6F", "sequenceNumber": 2 } } diff --git a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp index c8a5d07dc48..75acef4b48f 100644 --- a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp +++ b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp @@ -55,29 +55,29 @@ Response: { { "name": { "type": { - "repr": "vector" + "repr": "u64" }, "data": { - "Vector": [] + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { - "__typename": "MoveValue" + "__typename": "MoveObject" } }, { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { - "__typename": "MoveObject" + "__typename": "MoveValue" } }, { @@ -91,7 +91,7 @@ Response: { "bcs": "AAAAAAAAAAA=" }, "value": { - "__typename": "MoveObject" + "__typename": "MoveValue" } } ] @@ -135,29 +135,29 @@ Response: { { "name": { "type": { - "repr": "vector" + "repr": "u64" }, "data": { - "Vector": [] + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { - "__typename": "MoveValue" + "__typename": "MoveObject" } }, { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { - "__typename": "MoveObject" + "__typename": "MoveValue" } }, { @@ -171,7 +171,7 @@ Response: { "bcs": "AAAAAAAAAAA=" }, "value": { - "__typename": "MoveObject" + "__typename": "MoveValue" } } ] @@ -205,6 +205,20 @@ Response: { "__typename": "MoveValue" } }, + { + "name": { + "type": { + "repr": "u64" + }, + "data": { + "Number": "0" + }, + "bcs": "AAAAAAAAAAA=" + }, + "value": { + "__typename": "MoveObject" + } + }, { "name": { "type": { @@ -234,21 +248,11 @@ Response: { "bcs": "AAAAAAAAAAA=" }, "value": { - "__typename": "MoveObject" - } - }, - { - "name": { - "type": { - "repr": "u64" - }, + "bcs": "AAAAAAAAAAA=", "data": { "Number": "0" }, - "bcs": "AAAAAAAAAAA=" - }, - "value": { - "__typename": "MoveObject" + "__typename": "MoveValue" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/call/simple.exp b/crates/iota-graphql-e2e-tests/tests/call/simple.exp index b021531a44d..760cc9b2f15 100644 --- a/crates/iota-graphql-e2e-tests/tests/call/simple.exp +++ b/crates/iota-graphql-e2e-tests/tests/call/simple.exp @@ -81,7 +81,7 @@ Epoch advanced: 5 task 10, line 44: //# view-checkpoint -CheckpointSummary { epoch: 5, seq: 10, content_digest: 2eR3Fe6fAfkyCHD3Ts38QN4wihweGB1TsuWdQTyUjhqw, +CheckpointSummary { epoch: 5, seq: 10, content_digest: DQR51L8PXpXa5zms25YgRRS31MJCk9aEGK8Y2bYCLpjY, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 0, storage_cost: 0, storage_rebate: 0, non_refundable_storage_fee: 0 }} task 11, lines 46-51: @@ -159,8 +159,8 @@ Response: { "edges": [ { "node": { - "address": "0x5d742b4abf184b84114a2c388102331916350820d8d09d27fc9c928285fbc45c", - "digest": "smTS4BaZ82dqRsgcYP1mx2NmgBi93WNU5S97qrje46K", + "address": "0x947e601a3da5fd930b531b98c2bd276932c9ad3f577eaee3b014525cbbce82db", + "digest": "6fkFwrQef7sQfkh6RYkZPhTB7eNMPK3niY2tYKdHMBrZ", "owner": { "__typename": "AddressOwner" } @@ -186,8 +186,8 @@ Response: { "edges": [ { "node": { - "address": "0x5d742b4abf184b84114a2c388102331916350820d8d09d27fc9c928285fbc45c", - "digest": "smTS4BaZ82dqRsgcYP1mx2NmgBi93WNU5S97qrje46K", + "address": "0x947e601a3da5fd930b531b98c2bd276932c9ad3f577eaee3b014525cbbce82db", + "digest": "6fkFwrQef7sQfkh6RYkZPhTB7eNMPK3niY2tYKdHMBrZ", "owner": { "__typename": "AddressOwner" } @@ -201,8 +201,8 @@ Response: { "edges": [ { "node": { - "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2", - "digest": "8pafH5S16jKMuaYN7EuvhdPCBTe73C1WAACmtBJg135Q", + "address": "0x0809a0b38ecc3e4960d1b925e77ad9543d468a459e3ca12149f005375c84b12e", + "digest": "7nUWHjw6tJBLAyL2f1PGSXk7NiFvTVXXbMn4bMLBRAhE", "owner": { "__typename": "AddressOwner" } @@ -210,8 +210,8 @@ Response: { }, { "node": { - "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31", - "digest": "HMMWrCzpq5MonXNzB1d2KMMAHGR4W33KuoHhF5QRS4HK", + "address": "0x179a24069a0f3cc71d5e14813840e67455e20d3b5dc59de62c0ca2f1d7470960", + "digest": "EfrUon3tyN6ntSwGgAmL9s9kmHcUbaanWB8zd7hUuQdy", "owner": { "__typename": "AddressOwner" } @@ -219,8 +219,8 @@ Response: { }, { "node": { - "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461", - "digest": "5UNMNaEFYvE8iuCLCY173awgnNNfM78XdhtRB1PUUkAN", + "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2", + "digest": "AHm1g7qNSyvH1F64CudfyW2TNDHTEQn2htFN4KBvH8no", "owner": { "__typename": "AddressOwner" } @@ -228,8 +228,8 @@ Response: { }, { "node": { - "address": "0x4662cd0a74f2ee630e0bc4fe9863357169bff8490e00a0c8de72eedbfc9e192f", - "digest": "GmSnCj3RVGsmpc1YjesyZinrb98Y7fok4vaWz3nY1a6Y", + "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31", + "digest": "36L8V5PtQSFRyDqL6yyrNbUSotWGFxe3Mzo5vdLzQBHA", "owner": { "__typename": "AddressOwner" } @@ -237,8 +237,8 @@ Response: { }, { "node": { - "address": "0x4cfad1d6cc89d28c112a64096b16fe3e8fbc819d714871ed452dbb44d45f5cb2", - "digest": "CL76PYiRKRjj2ZkBdhwiv5c1ZakaR5QnnW5nLWxD71ob", + "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461", + "digest": "BS3XnZBredD6XUWHBoGTgvXw2fV3LaMJM4mPZW7fcr7P", "owner": { "__typename": "AddressOwner" } @@ -246,8 +246,8 @@ Response: { }, { "node": { - "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97", - "digest": "J8LZZaGPdwT1MRFnVnireQVuFYgK19BT5uA5TL8P4Mnn", + "address": "0x501c039e2e5b29f4b60883e201d8c7f98ffe7982d9cc52ca35758e12f743e87f", + "digest": "5DmWZK8CbAmesSMzKvHJsEsV59D7Ck5mXEnRmFukLtCH", "owner": { "__typename": "AddressOwner" } @@ -255,8 +255,8 @@ Response: { }, { "node": { - "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056", - "digest": "EG6Y3C4mPjnMR3SGFT2XsUBXTPTCsXNPw7PBAjdepjHb", + "address": "0x614b516f79fe7cfa933bb3510056c76cd8578cd98aa8d82809a7418e43cd82e9", + "digest": "3CduUvv5CejiRfu4G4kyv6KeqP5kgien16b44uQefpuX", "owner": { "__typename": "AddressOwner" } @@ -264,8 +264,8 @@ Response: { }, { "node": { - "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d", - "digest": "34Rc7MLpTWfvfV1YeqkyEn9U8Ziure8F1KVjmCh3p6iS", + "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97", + "digest": "DTQ5nzDeBCr3Y7Ye7dxy9PbVg8X6BUkaEhZW8xxYSefv", "owner": { "__typename": "AddressOwner" } @@ -273,8 +273,8 @@ Response: { }, { "node": { - "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8", - "digest": "DocRSiZHWBGiB4CMRKaHxa4XPfP3ybrEmxSEp7Go6bwN", + "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056", + "digest": "4a9daTZVzqRyyPvSidAc6JC5EjJqSJ8c7qU6Z272wnPf", "owner": { "__typename": "AddressOwner" } @@ -282,8 +282,8 @@ Response: { }, { "node": { - "address": "0xc7b2651a24c952eb731baf4ee7e08376947833231e12d4e09d77b35a284be94f", - "digest": "DSsjw9qvjE9XSapmykPoC9Z1pUhbFENBtL7RDSpTZAr3", + "address": "0xab5269747a9f2020ccc1e2bf5bfa0e4e7b7484812bdbab69925aa0df5a334f1d", + "digest": "EXuEdXFEpQTtbu5oL7QwbT9z52E9v5UvnTPNAehmZRCK", "owner": { "__typename": "AddressOwner" } @@ -291,8 +291,8 @@ Response: { }, { "node": { - "address": "0xd7c33508b56f0c054c2972007d6fad114c6efaa456fee246126e77024e7cf91e", - "digest": "CANDDJmtqBRSGQqVdmE6RAUkjqdf8omiXUrqFUbhbuGn", + "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d", + "digest": "9z4XCuFZDbB5FdWwvhQq5WH38AFPWZXTX15vWJ2DGcQT", "owner": { "__typename": "AddressOwner" } @@ -300,8 +300,8 @@ Response: { }, { "node": { - "address": "0xe43d31e12a1be924164da5a406481018dda424b9000990d589861175f64b815d", - "digest": "GV9ef2MUhiv4UaT2Xch812ECifidWvTBdtETfvHfTBUq", + "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8", + "digest": "7kPZ3unE3SxkBGcr7cb9hoDA8RYcYLdaED5MVrjo15N8", "owner": { "__typename": "AddressOwner" } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp index 918c43a83d4..6787297fa9d 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp @@ -80,7 +80,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "700" @@ -116,7 +116,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 2, "totalBalance": "600" @@ -152,7 +152,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 1, "totalBalance": "400" @@ -196,7 +196,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "700" @@ -232,7 +232,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 2, "totalBalance": "600" @@ -268,7 +268,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 1, "totalBalance": "400" @@ -347,7 +347,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 2, "totalBalance": "600" @@ -383,7 +383,7 @@ Response: { }, { "coinType": { - "repr": "0x72b0096564296b83ded200a9cef7f4aa3257b9f63d2cb41305171e2cc3758afd::fake::FAKE" + "repr": "0xf79d0e0cb778a20058b733b779ec62582843cc484b0cbfc5e00c44a9c8c0a7fe::fake::FAKE" }, "coinObjectCount": 1, "totalBalance": "400" diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp index 254edce1ead..bc4a82faa9f 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp @@ -94,12 +94,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S", + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -109,12 +109,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "A3BxB2KqSbEY5rzGjhm1FBLmRvVRG9pK8QEuaYnnvMZz", + "digest": "CVZJU6wpzrzUVJn6D5gPJ7WTa6DnXXW2zf8Q4TJz5U8N", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -124,12 +124,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "3q3x6TLWzA6VGc3uRsxbB3P3pPfeD3W9XwaqbYbE9xac", + "digest": "9zHWBCwudVy6yY8PMSnACHkWRb7m9ffhu3VckC7KNmf9", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -139,12 +139,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL", + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -161,12 +161,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "2WNkedo9ryA7XgpBREdQah76c8yu5h7KmUjD3MGJdsiC", + "digest": "EpCj1MWu1kXG5UpKEocqoc94FPExZmZcknLi8KhX8DAJ", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -176,12 +176,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "3Hnz1hLa3UGLRvyophw12hwhfmwnYpJM75fDuT6bWBEB", + "digest": "9PrPYWk1LisneYW89j8Ruc71AswAzWkq9U6YknR5dpoD", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -191,12 +191,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "Bwx7M14Z3TTQ8HjJan4NpfTp9uab6zGZ1t3VyHexrkjY", + "digest": "6G5KHk1BjBEV72EE6xX9LwwDcBjanfFCx6HujX1UCNCW", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -213,12 +213,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "GB8JFDwwGHRQrDMrbHqHMY5ZtWnWyfk9bzPQCfwQUq1h", + "digest": "F8FMZESLb2VXxiA5KwmygZvoQDALBqXFmXK2A1sxqvtT", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } @@ -228,12 +228,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "EqU64iWmUFhMRufjdcNtVKiBkVaGUfHE5b8GGmBvyXaj", + "digest": "FhSEiDcq5gr9E4M3xfvKWJcQSFANKPfBsEFqpDeU3Yy7", "sender": { "objects": { "edges": [ { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTAwAAAAAAAAA=" + "cursor": "IPJP6Fos9b+Cjn6xFBY4b5BIJrTRlXAirIS8h9LNXvkjAwAAAAAAAAA=" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp index 22325979953..9f23c98adde 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp @@ -33,7 +33,7 @@ Response: { "queryCoinsAtLatest": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAgAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -41,11 +41,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAgAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -54,11 +54,11 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAgAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -67,13 +67,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AgAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -85,7 +85,7 @@ Response: { }, "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -94,7 +94,7 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAgAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -102,11 +102,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAgAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -115,11 +115,11 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAgAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -128,13 +128,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AgAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -146,7 +146,7 @@ Response: { }, "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -155,7 +155,7 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AgAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -163,11 +163,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAgAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -176,11 +176,11 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAgAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -189,13 +189,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AgAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -207,9 +207,9 @@ Response: { }, "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -221,11 +221,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAgAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -234,11 +234,11 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAgAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -247,13 +247,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AgAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -272,7 +272,7 @@ Response: { "queryCoinsAtChkpt1": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -280,24 +280,24 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -306,13 +306,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AQAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -324,7 +324,7 @@ Response: { }, "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "300" } @@ -333,7 +333,7 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -341,24 +341,24 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -367,13 +367,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AQAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -385,7 +385,7 @@ Response: { }, "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -399,11 +399,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "300" } @@ -412,11 +412,11 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -453,7 +453,7 @@ Response: { "queryCoins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAwAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -461,11 +461,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAwAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -479,7 +479,7 @@ Response: { }, "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -488,7 +488,7 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAwAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -496,11 +496,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAwAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -509,13 +509,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AwAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -527,7 +527,7 @@ Response: { }, "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -536,7 +536,7 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AwAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -544,11 +544,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAwAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -557,13 +557,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AwAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -575,9 +575,9 @@ Response: { }, "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -589,11 +589,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAwAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "100300" } @@ -608,11 +608,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAwAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -621,13 +621,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AwAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -658,7 +658,7 @@ Response: { "queryCoinsAtChkpt1BeforeSnapshotCatchup": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -666,24 +666,24 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -692,13 +692,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AQAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -710,7 +710,7 @@ Response: { }, "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "300" } @@ -719,7 +719,7 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -727,24 +727,24 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { - "value": "200" + "value": "300" } } } } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -753,13 +753,13 @@ Response: { } }, { - "cursor": "IMacInfJfaowDpNNBdkoSgALQyU0WPWhzB0x66+oRDH9AQAAAAAAAAA=", + "cursor": "IOqHiBIiGGWRVX98PwcA7D6OlUxbWRIbTaAd43LibLWxAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xc69c2277c97daa300e934d05d9284a000b43253458f5a1cc1d31ebafa84431fd", + "id": "0xea87881222186591557f7c3f0700ec3e8e954c5b59121b4da01de372e26cb5b1", "balance": { - "value": "300" + "value": "200" } } } @@ -771,7 +771,7 @@ Response: { }, "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } @@ -785,11 +785,11 @@ Response: { "coins": { "edges": [ { - "cursor": "IDsIlA02kXloawgaHM7wOcNLPsj7qZUP7GJU5kplSemHAQAAAAAAAAA=", + "cursor": "IADQ2v0ct4nNzTYO05l+0d4aK04vvctc++HRiQ6gNsTgAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x3b08940d369179686b081a1ccef039c34b3ec8fba9950fec6254e64a6549e987", + "id": "0x00d0dafd1cb789cdcd360ed3997ed1de1a2b4e2fbdcb5cfbe1d1890ea036c4e0", "balance": { "value": "300" } @@ -798,11 +798,11 @@ Response: { } }, { - "cursor": "IFYBv/phSqHbWCaiuqdXOLTSGywnKgV6jTvBvpkKEm9pAQAAAAAAAAA=", + "cursor": "IE0ijO1u41EiLYHpPEz/85YK+UizMz1rxfX0l2FtDZHGAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x5601bffa614aa1db5826a2baa75738b4d21b2c272a057a8d3bc1be990a126f69", + "id": "0x4d228ced6ee351222d81e93c4cfff3960af948b3333d6bc5f5f497616d0d91c6", "balance": { "value": "100" } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp index ef4dd05b3ae..631c11680ad 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp @@ -90,35 +90,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IAlxFqpw4mr33+eCNTC2+MjuleY7rA2fiDMEuaT9vQ7VAQAAAAAAAAA=", + "cursor": "ICW9Iz/svdHWaWJMgCpvN9LDcLWyZMuvqGCI2SoA8QHJAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNA==" }, "value": { - "json": "df5" + "json": "df4" } } }, { - "cursor": "IJnnpAXHeWHn0RxdjnH4UpFwee+KNap3cYsMCArOK0QRAQAAAAAAAAA=", + "cursor": "IDzQpZ4uouU18iA/y5yZbHL74w6TPGxWQiC/mtm/4hZrAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "IOIK1Pc7k/v+YR5s6nC80BdguWbuJjbYUTR1KFHnGw5LAQAAAAAAAAA=", + "cursor": "IPJwx5C9w7uqrDrMEb/voYfVpqNzNsYN8K1+0I6g1Mi8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df6" + "json": "df5" } } } @@ -139,35 +139,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IAlxFqpw4mr33+eCNTC2+MjuleY7rA2fiDMEuaT9vQ7VAQAAAAAAAAA=", + "cursor": "ICW9Iz/svdHWaWJMgCpvN9LDcLWyZMuvqGCI2SoA8QHJAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNA==" }, "value": { - "json": "df5" + "json": "df4" } } }, { - "cursor": "IJnnpAXHeWHn0RxdjnH4UpFwee+KNap3cYsMCArOK0QRAQAAAAAAAAA=", + "cursor": "IDzQpZ4uouU18iA/y5yZbHL74w6TPGxWQiC/mtm/4hZrAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "IOIK1Pc7k/v+YR5s6nC80BdguWbuJjbYUTR1KFHnGw5LAQAAAAAAAAA=", + "cursor": "IPJwx5C9w7uqrDrMEb/voYfVpqNzNsYN8K1+0I6g1Mi8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df6" + "json": "df5" } } } @@ -188,40 +188,40 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IAlxFqpw4mr33+eCNTC2+MjuleY7rA2fiDMEuaT9vQ7VAQAAAAAAAAA=", + "cursor": "IAVjdahaCLwpSAQXBU3E+6kECNVKugD8UuK2qUzNdi5JAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmMQ==" }, "value": { - "json": "df5" + "json": "df1" } } }, { - "cursor": "IB88rfczUpq6fYbbbtRTLaR+Ut+jA2cnNvJuZoUJuaY/AQAAAAAAAAA=", + "cursor": "ICW9Iz/svdHWaWJMgCpvN9LDcLWyZMuvqGCI2SoA8QHJAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmNA==" }, "value": { - "json": "df2" + "json": "df4" } } }, { - "cursor": "IJnnpAXHeWHn0RxdjnH4UpFwee+KNap3cYsMCArOK0QRAQAAAAAAAAA=", + "cursor": "IDzQpZ4uouU18iA/y5yZbHL74w6TPGxWQiC/mtm/4hZrAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "ILQp8MKg0+1bN22dk59+rm41rfOY8GqwDRyEx14d6VuHAQAAAAAAAAA=", + "cursor": "INybVYlfB500mrvJP0a4IRyfrqtm20AD5vY2SLx7b56fAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMw==" @@ -232,24 +232,24 @@ Response: { } }, { - "cursor": "IOIK1Pc7k/v+YR5s6nC80BdguWbuJjbYUTR1KFHnGw5LAQAAAAAAAAA=", + "cursor": "IPJwx5C9w7uqrDrMEb/voYfVpqNzNsYN8K1+0I6g1Mi8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df3" + "json": "df5" } } }, { - "cursor": "IPUa99KObozK+eodu97J1FNdwFSMsX8MUw5IP/Sg7Z2aAQAAAAAAAAA=", + "cursor": "IPpKWpwB6zWe0R4DDlV8rsWL3SAjH+fS7gLSpM4F4TEEAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==" + "bcs": "A2RmMg==" }, "value": { - "json": "df1" + "json": "df2" } } } @@ -283,35 +283,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IAlxFqpw4mr33+eCNTC2+MjuleY7rA2fiDMEuaT9vQ7VAQAAAAAAAAA=", + "cursor": "ICW9Iz/svdHWaWJMgCpvN9LDcLWyZMuvqGCI2SoA8QHJAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNA==" }, "value": { - "json": "df5" + "json": "df4" } } }, { - "cursor": "IJnnpAXHeWHn0RxdjnH4UpFwee+KNap3cYsMCArOK0QRAQAAAAAAAAA=", + "cursor": "IDzQpZ4uouU18iA/y5yZbHL74w6TPGxWQiC/mtm/4hZrAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmNg==" }, "value": { - "json": "df4" + "json": "df6" } } }, { - "cursor": "IOIK1Pc7k/v+YR5s6nC80BdguWbuJjbYUTR1KFHnGw5LAQAAAAAAAAA=", + "cursor": "IPJwx5C9w7uqrDrMEb/voYfVpqNzNsYN8K1+0I6g1Mi8AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df6" + "json": "df5" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp index 25496ba5c36..2892016a7b4 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp @@ -41,7 +41,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IIuU/xNbT0zh6LdGe62NTpOV83IJGGj7O3VED+vISDP0AQAAAAAAAAA=", + "cursor": "IBJbpEIIzl8fdGriR1rXGZLfXqH+7GDfY3YK7qiUcdWKAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -49,7 +49,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x73e23175c3ca37e0c7d99110edc73a385b4f313e8f27b35dc8231d938d99bbbc", + "id": "0x943f5569fb48fa1f82582ded313d5a7fc0fdfbc2294c043fe22421ff22609825", "count": "0" } } @@ -65,7 +65,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x73e23175c3ca37e0c7d99110edc73a385b4f313e8f27b35dc8231d938d99bbbc", + "id": "0x943f5569fb48fa1f82582ded313d5a7fc0fdfbc2294c043fe22421ff22609825", "count": "0" } } @@ -77,7 +77,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IIuU/xNbT0zh6LdGe62NTpOV83IJGGj7O3VED+vISDP0AQAAAAAAAAA=", + "cursor": "IBJbpEIIzl8fdGriR1rXGZLfXqH+7GDfY3YK7qiUcdWKAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x73e23175c3ca37e0c7d99110edc73a385b4f313e8f27b35dc8231d938d99bbbc", + "id": "0x943f5569fb48fa1f82582ded313d5a7fc0fdfbc2294c043fe22421ff22609825", "count": "0" } } @@ -101,7 +101,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x73e23175c3ca37e0c7d99110edc73a385b4f313e8f27b35dc8231d938d99bbbc", + "id": "0x943f5569fb48fa1f82582ded313d5a7fc0fdfbc2294c043fe22421ff22609825", "count": "0" } } @@ -117,7 +117,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x73e23175c3ca37e0c7d99110edc73a385b4f313e8f27b35dc8231d938d99bbbc", + "id": "0x943f5569fb48fa1f82582ded313d5a7fc0fdfbc2294c043fe22421ff22609825", "count": "0" } } @@ -168,7 +168,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x73e23175c3ca37e0c7d99110edc73a385b4f313e8f27b35dc8231d938d99bbbc", + "id": "0x943f5569fb48fa1f82582ded313d5a7fc0fdfbc2294c043fe22421ff22609825", "count": "0" } } @@ -222,7 +222,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x73e23175c3ca37e0c7d99110edc73a385b4f313e8f27b35dc8231d938d99bbbc", + "id": "0x943f5569fb48fa1f82582ded313d5a7fc0fdfbc2294c043fe22421ff22609825", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp index ff72e35572f..4523abf830f 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp @@ -36,7 +36,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IB3/+PN7K7rz6NhNeXi6jfD/6T7BDjv7nD6f+cyPBoYQAQAAAAAAAAA=", + "cursor": "IMBaGLHiWdkiqQUT7iHdI0Vac5RUxmc3WSzgjr3PPEWVAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -44,7 +44,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x80a0dcf98c3730a1ad5065971b9f22db79bd0f03c044b679699f85187072861e", + "id": "0x97e1094f852cb949d64f5bedfcba3566a22932afb376b9f399a6466945d6233b", "count": "0" } } @@ -60,7 +60,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x80a0dcf98c3730a1ad5065971b9f22db79bd0f03c044b679699f85187072861e", + "id": "0x97e1094f852cb949d64f5bedfcba3566a22932afb376b9f399a6466945d6233b", "count": "0" } } @@ -71,7 +71,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IB3/+PN7K7rz6NhNeXi6jfD/6T7BDjv7nD6f+cyPBoYQAQAAAAAAAAA=", + "cursor": "IMBaGLHiWdkiqQUT7iHdI0Vac5RUxmc3WSzgjr3PPEWVAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -79,7 +79,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x80a0dcf98c3730a1ad5065971b9f22db79bd0f03c044b679699f85187072861e", + "id": "0x97e1094f852cb949d64f5bedfcba3566a22932afb376b9f399a6466945d6233b", "count": "0" } } @@ -95,7 +95,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x80a0dcf98c3730a1ad5065971b9f22db79bd0f03c044b679699f85187072861e", + "id": "0x97e1094f852cb949d64f5bedfcba3566a22932afb376b9f399a6466945d6233b", "count": "0" } } @@ -107,7 +107,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IB3/+PN7K7rz6NhNeXi6jfD/6T7BDjv7nD6f+cyPBoYQAQAAAAAAAAA=", + "cursor": "IMBaGLHiWdkiqQUT7iHdI0Vac5RUxmc3WSzgjr3PPEWVAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -115,7 +115,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x80a0dcf98c3730a1ad5065971b9f22db79bd0f03c044b679699f85187072861e", + "id": "0x97e1094f852cb949d64f5bedfcba3566a22932afb376b9f399a6466945d6233b", "count": "0" } } @@ -131,7 +131,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x80a0dcf98c3730a1ad5065971b9f22db79bd0f03c044b679699f85187072861e", + "id": "0x97e1094f852cb949d64f5bedfcba3566a22932afb376b9f399a6466945d6233b", "count": "0" } } @@ -184,7 +184,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x80a0dcf98c3730a1ad5065971b9f22db79bd0f03c044b679699f85187072861e", + "id": "0x97e1094f852cb949d64f5bedfcba3566a22932afb376b9f399a6466945d6233b", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp index e97867682c9..5d76afd242e 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp @@ -61,7 +61,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJ3CIWj66wAVzm6IQ8Mb09LdRnQPAwHDGxrei6kiglGTAQAAAAAAAAA=", + "cursor": "ICaelxDQZuLo8vkDI++Fh7RrBJ9k4evLDt79E8ty7ls/AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -69,7 +69,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } @@ -96,7 +96,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJ3CIWj66wAVzm6IQ8Mb09LdRnQPAwHDGxrei6kiglGTAQAAAAAAAAA=", + "cursor": "ICaelxDQZuLo8vkDI++Fh7RrBJ9k4evLDt79E8ty7ls/AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -104,7 +104,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } @@ -120,7 +120,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } @@ -139,7 +139,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJ3CIWj66wAVzm6IQ8Mb09LdRnQPAwHDGxrei6kiglGTAQAAAAAAAAA=", + "cursor": "ICaelxDQZuLo8vkDI++Fh7RrBJ9k4evLDt79E8ty7ls/AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -147,7 +147,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } @@ -163,7 +163,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } @@ -182,7 +182,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJ3CIWj66wAVzm6IQ8Mb09LdRnQPAwHDGxrei6kiglGTAQAAAAAAAAA=", + "cursor": "ICaelxDQZuLo8vkDI++Fh7RrBJ9k4evLDt79E8ty7ls/AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -190,7 +190,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } @@ -206,7 +206,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9ba661467fbe62af4eef8e4cb49aecfcf7cf7d3c7b4604a1acfd978484ac7408", + "id": "0xefb591effe4d19c2506c84fdd94dc019958a2ab6e31b9d4ee8c3bc82f43bbd3b", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp index a767dcfd89c..86b692b8878 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp @@ -84,7 +84,7 @@ task 9, lines 103-165: Response: { "data": { "parent_version_2_no_dof": { - "address": "0x144f89a25fed0bbcf10d3dc9c9a835c923972f6a652a0e4401c0015c64f2b925", + "address": "0x9b17c77897b11d25e53cc7463a81c1d9af23d84d8a5dd34870336d13bff9dfbb", "dynamicFields": { "edges": [] } @@ -93,7 +93,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlAQAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnAQAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -104,7 +104,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", "count": "1" } } @@ -115,13 +115,13 @@ Response: { } }, "child_version_2_no_parent": { - "address": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", + "address": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", "owner": {} }, "child_version_3_has_parent": { "owner": { "parent": { - "address": "0x6ab9f51f76f96621000e4e706498a2b1243aa4c96a48768c6e88ca19d563fae5" + "address": "0xb89417c448fb130a9fea7bc44997d1b87ae2c2ba76153e3db44a72e8779cfaa7" } } } @@ -173,63 +173,63 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDdmynPsciuyRWEuGcUCwsXv/s23PYySAE8E6ds44knAAgAAAAAAAAA=", + "cursor": "IFtgLwfbCz/3E//mzdSVpu4ez5fBp7KA5ltdR38IrI92AgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df2" + "json": "df3" } } }, { - "cursor": "IEB3e0osn0vVUIo8hIaYgcZhigq2Wm8ePPv1mdgKFd/5AgAAAAAAAAA=", + "cursor": "ILNCNL5tMmhrIjqkp6jCwD+VbCSLvcMmv5G/z0pietDPAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMg==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df2" } } }, { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlAgAAAAAAAAA=", + "cursor": "ILP0gd7OZRIuOKQKAzembrtU1HN4JgcwfPKrx+U6mTkzAgAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMQ==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", - "count": "2" - } - } + "json": "df1" } } }, { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaAgAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df1" + "contents": { + "json": { + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", + "count": "2" + } + } } } } @@ -240,7 +240,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlAgAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnAgAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -251,7 +251,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", "count": "1" } } @@ -268,22 +268,7 @@ Response: { }, "use_dof_version_4_cursor_at_parent_version_4": { "dynamicFields": { - "edges": [ - { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMQ==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df1" - } - } - } - ] + "edges": [] } }, "use_dof_version_3_cursor_at_parent_version_3": { @@ -314,7 +299,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", "count": "1" } } @@ -333,7 +318,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", "count": "2" } } @@ -398,63 +383,63 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDdmynPsciuyRWEuGcUCwsXv/s23PYySAE8E6ds44knAAwAAAAAAAAA=", + "cursor": "IFtgLwfbCz/3E//mzdSVpu4ez5fBp7KA5ltdR38IrI92AwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df2" + "json": "df3" } } }, { - "cursor": "IEB3e0osn0vVUIo8hIaYgcZhigq2Wm8ePPv1mdgKFd/5AwAAAAAAAAA=", + "cursor": "ILNCNL5tMmhrIjqkp6jCwD+VbCSLvcMmv5G/z0pietDPAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMg==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df2" } } }, { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlAwAAAAAAAAA=", + "cursor": "ILP0gd7OZRIuOKQKAzembrtU1HN4JgcwfPKrx+U6mTkzAwAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMQ==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", - "count": "2" - } - } + "json": "df1" } } }, { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaAwAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df1" + "contents": { + "json": { + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", + "count": "2" + } + } } } } @@ -470,49 +455,35 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMQ==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df1" - } - } - }, - { - "cursor": "IAECR2fOXHFO08vEcUZpNvzgnhTDUZzomslx9qLEZvv8AwAAAAAAAAA=", + "cursor": "IFtgLwfbCz/3E//mzdSVpu4ez5fBp7KA5ltdR38IrI92AwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df3" } } }, { - "cursor": "IC70WQdDs6UnCpB5yZ1xZHfSSytat3mLcAW9wyb6gV/YAwAAAAAAAAA=", + "cursor": "IGh9QdJmerULm2U0Vgl+dHTky2w8FY1yUcefsjV0tDrYAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df6" + "json": "df5" } } }, { - "cursor": "IDdmynPsciuyRWEuGcUCwsXv/s23PYySAE8E6ds44knAAwAAAAAAAAA=", + "cursor": "ILNCNL5tMmhrIjqkp6jCwD+VbCSLvcMmv5G/z0pietDPAwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMg==", @@ -526,21 +497,21 @@ Response: { } }, { - "cursor": "IEB3e0osn0vVUIo8hIaYgcZhigq2Wm8ePPv1mdgKFd/5AwAAAAAAAAA=", + "cursor": "ILP0gd7OZRIuOKQKAzembrtU1HN4JgcwfPKrx+U6mTkzAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df1" } } }, { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlAwAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnAwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -551,7 +522,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", "count": "2" } } @@ -559,30 +530,30 @@ Response: { } }, { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaAwAAAAAAAAA=", + "cursor": "IMXxmNuixDgFB3iNq2WVCHt6uyaNF4mprMCQV1yGDvwhAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmNg==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df6" } } }, { - "cursor": "IMwQvC/gNVI0QaXqQ85M2/Ld7rFIXUjtdl+l9lZ+S7LFAwAAAAAAAAA=", + "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -593,21 +564,21 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaAwAAAAAAAAA=", + "cursor": "IMXxmNuixDgFB3iNq2WVCHt6uyaNF4mprMCQV1yGDvwhAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmNg==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df6" } } }, { - "cursor": "IMwQvC/gNVI0QaXqQ85M2/Ld7rFIXUjtdl+l9lZ+S7LFAwAAAAAAAAA=", + "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECAwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNA==", @@ -670,63 +641,63 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDdmynPsciuyRWEuGcUCwsXv/s23PYySAE8E6ds44knABAAAAAAAAAA=", + "cursor": "IFtgLwfbCz/3E//mzdSVpu4ez5fBp7KA5ltdR38IrI92BAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df2" + "json": "df3" } } }, { - "cursor": "IEB3e0osn0vVUIo8hIaYgcZhigq2Wm8ePPv1mdgKFd/5BAAAAAAAAAA=", + "cursor": "ILNCNL5tMmhrIjqkp6jCwD+VbCSLvcMmv5G/z0pietDPBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMg==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df2" } } }, { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlBAAAAAAAAAA=", + "cursor": "ILP0gd7OZRIuOKQKAzembrtU1HN4JgcwfPKrx+U6mTkzBAAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMQ==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", - "count": "2" - } - } + "json": "df1" } } }, { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaBAAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df1" + "contents": { + "json": { + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", + "count": "2" + } + } } } } @@ -735,85 +706,70 @@ Response: { }, "parent_version_4_paginated_on_dof_consistent": { "dynamicFields": { - "edges": [ - { - "cursor": "IMHOuFTfn41iPJnqKDYTTp2Amgl6gV9TCgF5EYXhzDUaAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMQ==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df1" - } - } - } - ] + "edges": [] } }, "parent_version_6_no_df_1_2_3": { "dynamicFields": { "edges": [ { - "cursor": "IAECR2fOXHFO08vEcUZpNvzgnhTDUZzomslx9qLEZvv8BAAAAAAAAAA=", + "cursor": "IGh9QdJmerULm2U0Vgl+dHTky2w8FY1yUcefsjV0tDrYBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df5" } } }, { - "cursor": "IC70WQdDs6UnCpB5yZ1xZHfSSytat3mLcAW9wyb6gV/YBAAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df6" + "contents": { + "json": { + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", + "count": "2" + } + } } } }, { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlBAAAAAAAAAA=", + "cursor": "IMXxmNuixDgFB3iNq2WVCHt6uyaNF4mprMCQV1yGDvwhBAAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmNg==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", - "count": "2" - } - } + "json": "df6" } } }, { - "cursor": "IMwQvC/gNVI0QaXqQ85M2/Ld7rFIXUjtdl+l9lZ+S7LFBAAAAAAAAAA=", + "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -824,7 +780,21 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IMwQvC/gNVI0QaXqQ85M2/Ld7rFIXUjtdl+l9lZ+S7LFBAAAAAAAAAA=", + "cursor": "IMXxmNuixDgFB3iNq2WVCHt6uyaNF4mprMCQV1yGDvwhBAAAAAAAAAA=", + "node": { + "name": { + "bcs": "A2RmNg==", + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + } + }, + "value": { + "json": "df6" + } + } + }, + { + "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNA==", @@ -890,7 +860,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlBwAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnBwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -901,7 +871,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", "count": "2" } } @@ -916,63 +886,63 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IAECR2fOXHFO08vEcUZpNvzgnhTDUZzomslx9qLEZvv8BwAAAAAAAAA=", + "cursor": "IGh9QdJmerULm2U0Vgl+dHTky2w8FY1yUcefsjV0tDrYBwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df5" } } }, { - "cursor": "IC70WQdDs6UnCpB5yZ1xZHfSSytat3mLcAW9wyb6gV/YBwAAAAAAAAA=", + "cursor": "ILiUF8RI+xMKn+p7xEmX0bh64sK6dhU+PbRKcuh3nPqnBwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df6" + "contents": { + "json": { + "id": "0x02e810e035c69c934c04a5682db50c9927f3fd0e10767b19d415648df8cf7cb0", + "count": "2" + } + } } } }, { - "cursor": "IGq59R92+WYhAA5OcGSYorEkOqTJakh2jG6IyhnVY/rlBwAAAAAAAAA=", + "cursor": "IMXxmNuixDgFB3iNq2WVCHt6uyaNF4mprMCQV1yGDvwhBwAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmNg==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0x0ac7d3caff6fd8543b45b7f49793d0ce33e73d314a90646f2f3abc0dc0f5e7a6", - "count": "2" - } - } + "json": "df6" } } }, { - "cursor": "IMwQvC/gNVI0QaXqQ85M2/Ld7rFIXUjtdl+l9lZ+S7LFBwAAAAAAAAA=", + "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECBwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df5" + "json": "df4" } } } @@ -983,7 +953,21 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IMwQvC/gNVI0QaXqQ85M2/Ld7rFIXUjtdl+l9lZ+S7LFBAAAAAAAAAA=", + "cursor": "IMXxmNuixDgFB3iNq2WVCHt6uyaNF4mprMCQV1yGDvwhBAAAAAAAAAA=", + "node": { + "name": { + "bcs": "A2RmNg==", + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + } + }, + "value": { + "json": "df6" + } + } + }, + { + "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNA==", diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp index ccebc85f6c1..4a5a23d25bf 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp @@ -58,11 +58,11 @@ Response: { "nodes": [ { "value": { - "address": "0x954877dc60cfd8aa5a1cdb1e53e40ca45949c616e6767758e800e790faecd2d8", + "address": "0xb28dd7b68424f27f18a2f09c0324f625f3d867b29f70f4051974d990d4d7d016", "version": 5, "contents": { "json": { - "id": "0x954877dc60cfd8aa5a1cdb1e53e40ca45949c616e6767758e800e790faecd2d8", + "id": "0xb28dd7b68424f27f18a2f09c0324f625f3d867b29f70f4051974d990d4d7d016", "count": "0" } }, @@ -86,11 +86,11 @@ Response: { "nodes": [ { "value": { - "address": "0x954877dc60cfd8aa5a1cdb1e53e40ca45949c616e6767758e800e790faecd2d8", + "address": "0xb28dd7b68424f27f18a2f09c0324f625f3d867b29f70f4051974d990d4d7d016", "version": 5, "contents": { "json": { - "id": "0x954877dc60cfd8aa5a1cdb1e53e40ca45949c616e6767758e800e790faecd2d8", + "id": "0xb28dd7b68424f27f18a2f09c0324f625f3d867b29f70f4051974d990d4d7d016", "count": "0" } }, @@ -98,11 +98,11 @@ Response: { "nodes": [ { "value": { - "address": "0x296e61954d174dee57f4a5fe9cab9c3451d4961df27d27c8a4a3a1c349185c4b", + "address": "0x0ec204a36086f1c61e2b7289dbdd0403ae2784bcf7d8f5dd08b8ebf4c20c5670", "version": 6, "contents": { "json": { - "id": "0x296e61954d174dee57f4a5fe9cab9c3451d4961df27d27c8a4a3a1c349185c4b", + "id": "0x0ec204a36086f1c61e2b7289dbdd0403ae2784bcf7d8f5dd08b8ebf4c20c5670", "count": "0" } } @@ -145,7 +145,7 @@ Response: { "object": { "owner": { "parent": { - "address": "0xd553d1752a04a98a3252ac682302b2d5a1f97eba7f752ec3c07f6052738b1b1b" + "address": "0xe7314f67d6f9540716ea1d6f4fdf7421b51f612667227b58feb8a8607441b827" } }, "dynamicFields": { @@ -175,11 +175,11 @@ Response: { "nodes": [ { "value": { - "address": "0x296e61954d174dee57f4a5fe9cab9c3451d4961df27d27c8a4a3a1c349185c4b", + "address": "0x0ec204a36086f1c61e2b7289dbdd0403ae2784bcf7d8f5dd08b8ebf4c20c5670", "version": 6, "contents": { "json": { - "id": "0x296e61954d174dee57f4a5fe9cab9c3451d4961df27d27c8a4a3a1c349185c4b", + "id": "0x0ec204a36086f1c61e2b7289dbdd0403ae2784bcf7d8f5dd08b8ebf4c20c5670", "count": "0" } } @@ -203,11 +203,11 @@ Response: { "nodes": [ { "value": { - "address": "0x296e61954d174dee57f4a5fe9cab9c3451d4961df27d27c8a4a3a1c349185c4b", + "address": "0x0ec204a36086f1c61e2b7289dbdd0403ae2784bcf7d8f5dd08b8ebf4c20c5670", "version": 6, "contents": { "json": { - "id": "0x296e61954d174dee57f4a5fe9cab9c3451d4961df27d27c8a4a3a1c349185c4b", + "id": "0x0ec204a36086f1c61e2b7289dbdd0403ae2784bcf7d8f5dd08b8ebf4c20c5670", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp index ddf1e6dcce6..bc4a9a00930 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp @@ -78,18 +78,18 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IAOBRGK5lD0Nej7HS3XnFrhOWTDVz88WNSLSiQO/2YODAQAAAAAAAAA=", + "cursor": "IGfiujcTHQ4ThViBgOJMMJNiwAjhqrKO96Jmbbbyhd1OAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmMQ==" }, "value": { - "json": "df2" + "json": "df1" } } }, { - "cursor": "IFV2VC/Njx0C8OSVu4etZNkBZv792+lw+UdKoPyWgevFAQAAAAAAAAA=", + "cursor": "ILkS8+XRIdB8K8/82uBVhmckZ1uOcgVlEJ4cUrIhFsKYAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMw==" @@ -100,24 +100,13 @@ Response: { } }, { - "cursor": "IGCzvIIt5UFj66EDIc/9FGdPSZDnmwGERDKgDt25QVTPAQAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMQ==" - }, - "value": { - "json": "df1" - } - } - }, - { - "cursor": "IGZ2lOjt6inS/IYJm4vOaw4kzNZ4ieZtyOC7flwMytM7AQAAAAAAAAA=", + "cursor": "IL96FZg8SyIVpS4BTE7dgbpO79bWStn2f7WVJPLldS3wAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==" + "bcs": "A2RmMg==" }, "value": { - "json": "df3" + "json": "df2" } } } @@ -165,7 +154,7 @@ Contents: Test::M1::Parent { task 11, line 114: //# run Test::M1::mutate_df1 --sender A --args object(2,0) -mutated: object(0,0), object(2,0), object(4,2) +mutated: object(0,0), object(2,0), object(4,0) gas summary: computation_cost: 1000000, storage_cost: 4484000, storage_rebate: 4423200, non_refundable_storage_fee: 0 task 12, line 116: @@ -212,18 +201,18 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IAOBRGK5lD0Nej7HS3XnFrhOWTDVz88WNSLSiQO/2YODAgAAAAAAAAA=", + "cursor": "IGfiujcTHQ4ThViBgOJMMJNiwAjhqrKO96Jmbbbyhd1OAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmMQ==" }, "value": { - "json": "df2" + "json": "df1_mutated" } } }, { - "cursor": "IFV2VC/Njx0C8OSVu4etZNkBZv792+lw+UdKoPyWgevFAgAAAAAAAAA=", + "cursor": "ILkS8+XRIdB8K8/82uBVhmckZ1uOcgVlEJ4cUrIhFsKYAgAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMw==" @@ -234,24 +223,13 @@ Response: { } }, { - "cursor": "IGCzvIIt5UFj66EDIc/9FGdPSZDnmwGERDKgDt25QVTPAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMQ==" - }, - "value": { - "json": "df1_mutated" - } - } - }, - { - "cursor": "IGZ2lOjt6inS/IYJm4vOaw4kzNZ4ieZtyOC7flwMytM7AgAAAAAAAAA=", + "cursor": "IL96FZg8SyIVpS4BTE7dgbpO79bWStn2f7WVJPLldS3wAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==" + "bcs": "A2RmMg==" }, "value": { - "json": "df3" + "json": "df2" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp index d9eadb90c90..aa56dc181b3 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp @@ -41,7 +41,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IPFVoW6+4tOMuFWJMAkUTL28EhQKr4K5u5KDjyJL22IxAQAAAAAAAAA=", + "cursor": "IPlmVmG77q1Gi7fuMoBSp8WAgyNLSQLCaN56EyNrgQuHAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -49,7 +49,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "0" } } @@ -65,7 +65,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "0" } } @@ -77,7 +77,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IPFVoW6+4tOMuFWJMAkUTL28EhQKr4K5u5KDjyJL22IxAQAAAAAAAAA=", + "cursor": "IPlmVmG77q1Gi7fuMoBSp8WAgyNLSQLCaN56EyNrgQuHAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "0" } } @@ -101,7 +101,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "0" } } @@ -117,7 +117,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "0" } } @@ -168,7 +168,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "0" } } @@ -202,7 +202,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IPFVoW6+4tOMuFWJMAkUTL28EhQKr4K5u5KDjyJL22IxAwAAAAAAAAA=", + "cursor": "IPlmVmG77q1Gi7fuMoBSp8WAgyNLSQLCaN56EyNrgQuHAwAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -210,7 +210,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "1" } } @@ -226,7 +226,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "1" } } @@ -238,7 +238,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IPFVoW6+4tOMuFWJMAkUTL28EhQKr4K5u5KDjyJL22IxAwAAAAAAAAA=", + "cursor": "IPlmVmG77q1Gi7fuMoBSp8WAgyNLSQLCaN56EyNrgQuHAwAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -246,7 +246,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "1" } } @@ -262,7 +262,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "1" } } @@ -283,7 +283,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x33462bf2007040ccc3a9bd9b38e2c2949f069ba336965fb517003380afb1ca8d", + "id": "0x9a70ce887a02f00880461d9aa600f00168c9ff4033456faddbc59f2b74480514", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp index f4e26e3c372..134ab6e1afa 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp @@ -62,11 +62,11 @@ Response: { "nodes": [ { "value": { - "address": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "address": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "version": 5, "contents": { "json": { - "id": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "id": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "count": "0" } }, @@ -90,11 +90,11 @@ Response: { "nodes": [ { "value": { - "address": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "address": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "version": 5, "contents": { "json": { - "id": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "id": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "count": "0" } }, @@ -102,11 +102,11 @@ Response: { "nodes": [ { "value": { - "address": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "address": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "version": 6, "contents": { "json": { - "id": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "id": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "count": "0" } } @@ -131,11 +131,11 @@ Response: { "nodes": [ { "value": { - "address": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "address": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "version": 7, "contents": { "json": { - "id": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "id": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "count": "1" } }, @@ -143,11 +143,11 @@ Response: { "nodes": [ { "value": { - "address": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "address": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "version": 6, "contents": { "json": { - "id": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "id": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "count": "0" } } @@ -172,11 +172,11 @@ Response: { "nodes": [ { "value": { - "address": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "address": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "version": 7, "contents": { "json": { - "id": "0xe0f588e2ad8e6a1d63c189d3c92a70816d4eb8325cb5292739752e01100e89dc", + "id": "0xd4ff7b6c3918224e2e6e19de59a6a5f2bf9c44b5e4cf334e70cb04d63fdccd9a", "count": "1" } }, @@ -184,11 +184,11 @@ Response: { "nodes": [ { "value": { - "address": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "address": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "version": 8, "contents": { "json": { - "id": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "id": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "count": "1" } } @@ -233,11 +233,11 @@ Response: { "nodes": [ { "value": { - "address": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "address": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "version": 6, "contents": { "json": { - "id": "0x112e84595495024dd53c12d1c45f71a2493266a63b3cebe0ef5379b8dbe5f0e9", + "id": "0x048792ae8cd0ef4e5bad10b94f51e485b6713fc910417a3d7a9cd15cfe4ed99e", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp index d39f996d0cd..6051e088ddf 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp @@ -41,19 +41,19 @@ Response: { { "cursor": "eyJjIjozLCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "5kxKxJyFgHd4UJ5hRdDAqFKpxQ2By93WD5QBirmGxV5G" + "digest": "DBknzPQttLLFSS1hvFAFpLxyRfQoTJ4DfLQmLUWHopNA" } }, { "cursor": "eyJjIjozLCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "E6pjAnqyNZQ8Ye87uV6Twx5XTQdQ7jbFTrq2XKfjKLUd" + "digest": "3FLYmTCgUYBXgnjYUZyn8eYRaHu4RXJ6ejzCGsvmQ9Rg" } }, { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S" + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8" } }, { @@ -154,19 +154,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9", "node": { - "digest": "5kxKxJyFgHd4UJ5hRdDAqFKpxQ2By93WD5QBirmGxV5G" + "digest": "DBknzPQttLLFSS1hvFAFpLxyRfQoTJ4DfLQmLUWHopNA" } }, { "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9", "node": { - "digest": "E6pjAnqyNZQ8Ye87uV6Twx5XTQdQ7jbFTrq2XKfjKLUd" + "digest": "3FLYmTCgUYBXgnjYUZyn8eYRaHu4RXJ6ejzCGsvmQ9Rg" } }, { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S" + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8" } }, { @@ -183,19 +183,19 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "5kxKxJyFgHd4UJ5hRdDAqFKpxQ2By93WD5QBirmGxV5G" + "digest": "DBknzPQttLLFSS1hvFAFpLxyRfQoTJ4DfLQmLUWHopNA" } }, { "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "E6pjAnqyNZQ8Ye87uV6Twx5XTQdQ7jbFTrq2XKfjKLUd" + "digest": "3FLYmTCgUYBXgnjYUZyn8eYRaHu4RXJ6ejzCGsvmQ9Rg" } }, { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S" + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8" } } ] @@ -207,19 +207,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "A3BxB2KqSbEY5rzGjhm1FBLmRvVRG9pK8QEuaYnnvMZz" + "digest": "CVZJU6wpzrzUVJn6D5gPJ7WTa6DnXXW2zf8Q4TJz5U8N" } }, { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "3q3x6TLWzA6VGc3uRsxbB3P3pPfeD3W9XwaqbYbE9xac" + "digest": "9zHWBCwudVy6yY8PMSnACHkWRb7m9ffhu3VckC7KNmf9" } }, { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL" + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5" } }, { @@ -236,19 +236,19 @@ Response: { { "cursor": "eyJjIjo4LCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "5kxKxJyFgHd4UJ5hRdDAqFKpxQ2By93WD5QBirmGxV5G" + "digest": "DBknzPQttLLFSS1hvFAFpLxyRfQoTJ4DfLQmLUWHopNA" } }, { "cursor": "eyJjIjo4LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "E6pjAnqyNZQ8Ye87uV6Twx5XTQdQ7jbFTrq2XKfjKLUd" + "digest": "3FLYmTCgUYBXgnjYUZyn8eYRaHu4RXJ6ejzCGsvmQ9Rg" } }, { "cursor": "eyJjIjo4LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S" + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8" } }, { @@ -260,19 +260,19 @@ Response: { { "cursor": "eyJjIjo4LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "A3BxB2KqSbEY5rzGjhm1FBLmRvVRG9pK8QEuaYnnvMZz" + "digest": "CVZJU6wpzrzUVJn6D5gPJ7WTa6DnXXW2zf8Q4TJz5U8N" } }, { "cursor": "eyJjIjo4LCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "3q3x6TLWzA6VGc3uRsxbB3P3pPfeD3W9XwaqbYbE9xac" + "digest": "9zHWBCwudVy6yY8PMSnACHkWRb7m9ffhu3VckC7KNmf9" } }, { "cursor": "eyJjIjo4LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL" + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5" } } ] @@ -284,19 +284,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "2WNkedo9ryA7XgpBREdQah76c8yu5h7KmUjD3MGJdsiC" + "digest": "EpCj1MWu1kXG5UpKEocqoc94FPExZmZcknLi8KhX8DAJ" } }, { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "3Hnz1hLa3UGLRvyophw12hwhfmwnYpJM75fDuT6bWBEB" + "digest": "9PrPYWk1LisneYW89j8Ruc71AswAzWkq9U6YknR5dpoD" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "Bwx7M14Z3TTQ8HjJan4NpfTp9uab6zGZ1t3VyHexrkjY" + "digest": "6G5KHk1BjBEV72EE6xX9LwwDcBjanfFCx6HujX1UCNCW" } }, { @@ -313,19 +313,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9", "node": { - "digest": "5kxKxJyFgHd4UJ5hRdDAqFKpxQ2By93WD5QBirmGxV5G" + "digest": "DBknzPQttLLFSS1hvFAFpLxyRfQoTJ4DfLQmLUWHopNA" } }, { "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9", "node": { - "digest": "E6pjAnqyNZQ8Ye87uV6Twx5XTQdQ7jbFTrq2XKfjKLUd" + "digest": "3FLYmTCgUYBXgnjYUZyn8eYRaHu4RXJ6ejzCGsvmQ9Rg" } }, { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S" + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8" } }, { @@ -337,19 +337,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "A3BxB2KqSbEY5rzGjhm1FBLmRvVRG9pK8QEuaYnnvMZz" + "digest": "CVZJU6wpzrzUVJn6D5gPJ7WTa6DnXXW2zf8Q4TJz5U8N" } }, { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "3q3x6TLWzA6VGc3uRsxbB3P3pPfeD3W9XwaqbYbE9xac" + "digest": "9zHWBCwudVy6yY8PMSnACHkWRb7m9ffhu3VckC7KNmf9" } }, { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL" + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5" } }, { @@ -361,19 +361,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "2WNkedo9ryA7XgpBREdQah76c8yu5h7KmUjD3MGJdsiC" + "digest": "EpCj1MWu1kXG5UpKEocqoc94FPExZmZcknLi8KhX8DAJ" } }, { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "3Hnz1hLa3UGLRvyophw12hwhfmwnYpJM75fDuT6bWBEB" + "digest": "9PrPYWk1LisneYW89j8Ruc71AswAzWkq9U6YknR5dpoD" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "Bwx7M14Z3TTQ8HjJan4NpfTp9uab6zGZ1t3VyHexrkjY" + "digest": "6G5KHk1BjBEV72EE6xX9LwwDcBjanfFCx6HujX1UCNCW" } } ] @@ -395,13 +395,13 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "E6pjAnqyNZQ8Ye87uV6Twx5XTQdQ7jbFTrq2XKfjKLUd" + "digest": "3FLYmTCgUYBXgnjYUZyn8eYRaHu4RXJ6ejzCGsvmQ9Rg" } }, { "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S" + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8" } }, { @@ -420,13 +420,13 @@ Response: { { "cursor": "eyJjIjoxMSwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "3q3x6TLWzA6VGc3uRsxbB3P3pPfeD3W9XwaqbYbE9xac" + "digest": "9zHWBCwudVy6yY8PMSnACHkWRb7m9ffhu3VckC7KNmf9" } }, { "cursor": "eyJjIjoxMSwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL" + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5" } }, { @@ -445,13 +445,13 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "3Hnz1hLa3UGLRvyophw12hwhfmwnYpJM75fDuT6bWBEB" + "digest": "9PrPYWk1LisneYW89j8Ruc71AswAzWkq9U6YknR5dpoD" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "Bwx7M14Z3TTQ8HjJan4NpfTp9uab6zGZ1t3VyHexrkjY" + "digest": "6G5KHk1BjBEV72EE6xX9LwwDcBjanfFCx6HujX1UCNCW" } }, { @@ -480,7 +480,7 @@ Response: { { "cursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S" + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8" } } ] @@ -493,7 +493,7 @@ Response: { { "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL" + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5" } } ] @@ -506,7 +506,7 @@ Response: { { "cursor": "eyJjIjoxMCwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "Bwx7M14Z3TTQ8HjJan4NpfTp9uab6zGZ1t3VyHexrkjY" + "digest": "6G5KHk1BjBEV72EE6xX9LwwDcBjanfFCx6HujX1UCNCW" } } ] @@ -527,24 +527,24 @@ Response: { { "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL", + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5", "sender": { "objects": { "edges": [ { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tBgAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUBgAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEBgAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaBgAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raABgAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToBgAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtBgAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/BgAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8BgAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNBgAAAAAAAAA=" } ] } @@ -558,33 +558,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "EwmT47jKmNQDvxQgzwMCzjU7YbDD1aB7XAqDLXFCVk8S", + "digest": "K7nJMuu1BfRtH571XpR8aLrDrwQj77rq5EGYkXvtZA8", "sender": { "objects": { "edges": [ { - "cursor": "IAZ41/7iWym3cIjIhB3ZxFQLOFHw0NJqy45zL9YZF+RRDAAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUDAAAAAAAAAA=" }, { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tDAAAAAAAAAA=" + "cursor": "IBMe9XtEfEeF4siJsNCS9E9RwYi0nCx3dxxKyYxNlDeLDAAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEDAAAAAAAAAA=" + "cursor": "IBgWbu8ODp5Llq5zc6NiRQTJI7duHAqSC7WsKcTlOLymDAAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raADAAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaDAAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtDAAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToDAAAAAAAAAA=" }, { - "cursor": "ILmCB8AzORD4eIKY+8uaJnvqM4zm8Qr80DTrrcy8OOBwDAAAAAAAAAA=" + "cursor": "IE5j5kJ0LJjpnzxNZYRDPH8UJqf5hq7AkfKotI9A1KtjDAAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8DAAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/DAAAAAAAAAA=" }, { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTDAAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNDAAAAAAAAAA=" } ] } @@ -594,33 +594,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "A3BxB2KqSbEY5rzGjhm1FBLmRvVRG9pK8QEuaYnnvMZz", + "digest": "CVZJU6wpzrzUVJn6D5gPJ7WTa6DnXXW2zf8Q4TJz5U8N", "sender": { "objects": { "edges": [ { - "cursor": "IAZ41/7iWym3cIjIhB3ZxFQLOFHw0NJqy45zL9YZF+RRDAAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUDAAAAAAAAAA=" }, { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tDAAAAAAAAAA=" + "cursor": "IBMe9XtEfEeF4siJsNCS9E9RwYi0nCx3dxxKyYxNlDeLDAAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEDAAAAAAAAAA=" + "cursor": "IBgWbu8ODp5Llq5zc6NiRQTJI7duHAqSC7WsKcTlOLymDAAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raADAAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaDAAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtDAAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToDAAAAAAAAAA=" }, { - "cursor": "ILmCB8AzORD4eIKY+8uaJnvqM4zm8Qr80DTrrcy8OOBwDAAAAAAAAAA=" + "cursor": "IE5j5kJ0LJjpnzxNZYRDPH8UJqf5hq7AkfKotI9A1KtjDAAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8DAAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/DAAAAAAAAAA=" }, { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTDAAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNDAAAAAAAAAA=" } ] } @@ -630,33 +630,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "3q3x6TLWzA6VGc3uRsxbB3P3pPfeD3W9XwaqbYbE9xac", + "digest": "9zHWBCwudVy6yY8PMSnACHkWRb7m9ffhu3VckC7KNmf9", "sender": { "objects": { "edges": [ { - "cursor": "IAZ41/7iWym3cIjIhB3ZxFQLOFHw0NJqy45zL9YZF+RRDAAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUDAAAAAAAAAA=" }, { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tDAAAAAAAAAA=" + "cursor": "IBMe9XtEfEeF4siJsNCS9E9RwYi0nCx3dxxKyYxNlDeLDAAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEDAAAAAAAAAA=" + "cursor": "IBgWbu8ODp5Llq5zc6NiRQTJI7duHAqSC7WsKcTlOLymDAAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raADAAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaDAAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtDAAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToDAAAAAAAAAA=" }, { - "cursor": "ILmCB8AzORD4eIKY+8uaJnvqM4zm8Qr80DTrrcy8OOBwDAAAAAAAAAA=" + "cursor": "IE5j5kJ0LJjpnzxNZYRDPH8UJqf5hq7AkfKotI9A1KtjDAAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8DAAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/DAAAAAAAAAA=" }, { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTDAAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNDAAAAAAAAAA=" } ] } @@ -666,33 +666,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "9iWLh5uU71BUZapSEAR7K7LN8LCMow3V6TTjtLUn3XmL", + "digest": "57GriyrqmUyoD9sJ9mGKkxLPk9jfPqiQCEkPzSh4W8n5", "sender": { "objects": { "edges": [ { - "cursor": "IAZ41/7iWym3cIjIhB3ZxFQLOFHw0NJqy45zL9YZF+RRDAAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUDAAAAAAAAAA=" }, { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tDAAAAAAAAAA=" + "cursor": "IBMe9XtEfEeF4siJsNCS9E9RwYi0nCx3dxxKyYxNlDeLDAAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEDAAAAAAAAAA=" + "cursor": "IBgWbu8ODp5Llq5zc6NiRQTJI7duHAqSC7WsKcTlOLymDAAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raADAAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaDAAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtDAAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToDAAAAAAAAAA=" }, { - "cursor": "ILmCB8AzORD4eIKY+8uaJnvqM4zm8Qr80DTrrcy8OOBwDAAAAAAAAAA=" + "cursor": "IE5j5kJ0LJjpnzxNZYRDPH8UJqf5hq7AkfKotI9A1KtjDAAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8DAAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/DAAAAAAAAAA=" }, { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTDAAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNDAAAAAAAAAA=" } ] } @@ -702,33 +702,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "2WNkedo9ryA7XgpBREdQah76c8yu5h7KmUjD3MGJdsiC", + "digest": "EpCj1MWu1kXG5UpKEocqoc94FPExZmZcknLi8KhX8DAJ", "sender": { "objects": { "edges": [ { - "cursor": "IAZ41/7iWym3cIjIhB3ZxFQLOFHw0NJqy45zL9YZF+RRDAAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUDAAAAAAAAAA=" }, { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tDAAAAAAAAAA=" + "cursor": "IBMe9XtEfEeF4siJsNCS9E9RwYi0nCx3dxxKyYxNlDeLDAAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEDAAAAAAAAAA=" + "cursor": "IBgWbu8ODp5Llq5zc6NiRQTJI7duHAqSC7WsKcTlOLymDAAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raADAAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaDAAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtDAAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToDAAAAAAAAAA=" }, { - "cursor": "ILmCB8AzORD4eIKY+8uaJnvqM4zm8Qr80DTrrcy8OOBwDAAAAAAAAAA=" + "cursor": "IE5j5kJ0LJjpnzxNZYRDPH8UJqf5hq7AkfKotI9A1KtjDAAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8DAAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/DAAAAAAAAAA=" }, { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTDAAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNDAAAAAAAAAA=" } ] } @@ -738,33 +738,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "3Hnz1hLa3UGLRvyophw12hwhfmwnYpJM75fDuT6bWBEB", + "digest": "9PrPYWk1LisneYW89j8Ruc71AswAzWkq9U6YknR5dpoD", "sender": { "objects": { "edges": [ { - "cursor": "IAZ41/7iWym3cIjIhB3ZxFQLOFHw0NJqy45zL9YZF+RRDAAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUDAAAAAAAAAA=" }, { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tDAAAAAAAAAA=" + "cursor": "IBMe9XtEfEeF4siJsNCS9E9RwYi0nCx3dxxKyYxNlDeLDAAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEDAAAAAAAAAA=" + "cursor": "IBgWbu8ODp5Llq5zc6NiRQTJI7duHAqSC7WsKcTlOLymDAAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raADAAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaDAAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtDAAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToDAAAAAAAAAA=" }, { - "cursor": "ILmCB8AzORD4eIKY+8uaJnvqM4zm8Qr80DTrrcy8OOBwDAAAAAAAAAA=" + "cursor": "IE5j5kJ0LJjpnzxNZYRDPH8UJqf5hq7AkfKotI9A1KtjDAAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8DAAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/DAAAAAAAAAA=" }, { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTDAAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNDAAAAAAAAAA=" } ] } @@ -774,33 +774,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "Bwx7M14Z3TTQ8HjJan4NpfTp9uab6zGZ1t3VyHexrkjY", + "digest": "6G5KHk1BjBEV72EE6xX9LwwDcBjanfFCx6HujX1UCNCW", "sender": { "objects": { "edges": [ { - "cursor": "IAZ41/7iWym3cIjIhB3ZxFQLOFHw0NJqy45zL9YZF+RRDAAAAAAAAAA=" + "cursor": "IAqOtPKLZv5sSVoHgGBSH5Z/7THe2YMgtyXEs4XOjhmUDAAAAAAAAAA=" }, { - "cursor": "IAz2L92GTy3bRQokgdsccY5vfPuQK8KudYQMyh4Vf8+tDAAAAAAAAAA=" + "cursor": "IBMe9XtEfEeF4siJsNCS9E9RwYi0nCx3dxxKyYxNlDeLDAAAAAAAAAA=" }, { - "cursor": "IBHX4D82A7/ZLerkJoHcZjVY/9QGa2PNThEMJ0i/xZhEDAAAAAAAAAA=" + "cursor": "IBgWbu8ODp5Llq5zc6NiRQTJI7duHAqSC7WsKcTlOLymDAAAAAAAAAA=" }, { - "cursor": "IJ2oGY9DeOyhhxdX+ImgY+PjoaVS/HlyZ6cBqgyC9raADAAAAAAAAAA=" + "cursor": "IDCk/eFDICU5bJOmkfJxQVqV8JrDyOz6Tauoqk5x8iqaDAAAAAAAAAA=" }, { - "cursor": "ILOePBMfcokYNUYE29o3P2z1pIVl9KzwnrR5str8lONtDAAAAAAAAAA=" + "cursor": "IER3AzSdIiW2vo31JgRDcJ/o6/HNxGqDqCUVgiRmefToDAAAAAAAAAA=" }, { - "cursor": "ILmCB8AzORD4eIKY+8uaJnvqM4zm8Qr80DTrrcy8OOBwDAAAAAAAAAA=" + "cursor": "IE5j5kJ0LJjpnzxNZYRDPH8UJqf5hq7AkfKotI9A1KtjDAAAAAAAAAA=" }, { - "cursor": "IOJkIrorXAODWH18HBIrPvmj/7xA3k8oQyVOYuBJ/FQ8DAAAAAAAAAA=" + "cursor": "IFYt/Yn+B/FJrTPb4iM7qp3rOOyrHtP4KS39BQOsokq/DAAAAAAAAAA=" }, { - "cursor": "IP/YY3sBms9tv6LOECqfoZ9YYyMPFwAH+CT+ReeP7XwTDAAAAAAAAAA=" + "cursor": "IIq0jvZVbmaCu9nM03tc3K+PKXTPBbSWOF6oNGhKy8CNDAAAAAAAAAA=" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp index 4d9c6c85d40..4b70b51238c 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp @@ -29,7 +29,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "0" } } @@ -57,7 +57,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "1" } } @@ -69,7 +69,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "0" } } @@ -104,7 +104,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "1" } } @@ -134,7 +134,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "1" } } @@ -151,7 +151,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "0" } } @@ -205,7 +205,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "1" } } @@ -222,7 +222,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0xeabd1fec2bdf0127bb76f33a127372a8f49d362822878329073f6c09e827a375", + "id": "0x87eba71429ba37c3ea8af1becf245393e34d149b2bb8bf75e3afb67f7fa7a34d", "value": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp index 82f5f0e50e5..90e15361e7f 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp @@ -31,24 +31,26 @@ Response: { "data": { "one_of_these_will_yield_an_object": { "objects": { - "nodes": [ - { - "version": 4, + "nodes": [] + } + }, + "if_the_other_does_not": { + "nodes": [ + { + "version": 3, + "asMoveObject": { "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } } - ] - } - }, - "if_the_other_does_not": { - "nodes": [] + } + ] } } } @@ -75,24 +77,26 @@ Response: { "data": { "paginating_on_checkpoint_1": { "objects": { - "nodes": [ - { - "version": 4, + "nodes": [] + } + }, + "should_not_have_more_than_one_result": { + "nodes": [ + { + "version": 3, + "asMoveObject": { "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } } - ] - } - }, - "should_not_have_more_than_one_result": { - "nodes": [] + } + ] } } } @@ -105,50 +109,50 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x3f1782ce8c0c6978931806a9da781f6e2af5cf448d673b709efc4c7a82c33d7c", + "value": "2" } } }, { - "version": 6, + "version": 4, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0xfe2a855cb35f7b1dea804e23c02d0c78cc0cc933e41b9d2e320eb1b00d7d322e", - "value": "2" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } } } @@ -166,50 +170,50 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x3f1782ce8c0c6978931806a9da781f6e2af5cf448d673b709efc4c7a82c33d7c", + "value": "2" } } }, { - "version": 6, + "version": 4, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0xfe2a855cb35f7b1dea804e23c02d0c78cc0cc933e41b9d2e320eb1b00d7d322e", - "value": "2" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } } } @@ -235,60 +239,55 @@ Response: { "data": { "after_obj_6_0_at_checkpoint_2": { "objects": { - "nodes": [] - } - }, - "before_obj_6_0_at_checkpoint_2": { - "nodes": [ - { - "version": 6, - "asMoveObject": { + "nodes": [ + { + "version": 4, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } }, - "note_that_owner_result_should_reflect_latest_state": { + "owner_at_latest_state_has_iota_only": { "owner": { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x3f1782ce8c0c6978931806a9da781f6e2af5cf448d673b709efc4c7a82c33d7c", + "value": "2" } } }, { - "version": 6, + "version": 4, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } }, @@ -299,7 +298,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "300000000000000" } @@ -307,14 +306,14 @@ Response: { } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0xfe2a855cb35f7b1dea804e23c02d0c78cc0cc933e41b9d2e320eb1b00d7d322e", - "value": "2" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } } } @@ -322,57 +321,55 @@ Response: { } } } - } - }, - { - "version": 6, - "asMoveObject": { + }, + { + "version": 3, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } }, - "note_that_owner_result_should_reflect_latest_state": { + "owner_at_latest_state_has_iota_only": { "owner": { "objects": { "nodes": [ { - "version": 3, + "version": 5, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x3f1782ce8c0c6978931806a9da781f6e2af5cf448d673b709efc4c7a82c33d7c", + "value": "2" } } }, { - "version": 6, + "version": 4, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } }, @@ -383,7 +380,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "300000000000000" } @@ -391,14 +388,14 @@ Response: { } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0xfe2a855cb35f7b1dea804e23c02d0c78cc0cc933e41b9d2e320eb1b00d7d322e", - "value": "2" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } } } @@ -406,57 +403,55 @@ Response: { } } } - } - }, - { - "version": 4, - "asMoveObject": { + }, + { + "version": 6, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } }, - "note_that_owner_result_should_reflect_latest_state": { + "owner_at_latest_state_has_iota_only": { "owner": { "objects": { "nodes": [ { - "version": 3, + "version": 5, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x3f1782ce8c0c6978931806a9da781f6e2af5cf448d673b709efc4c7a82c33d7c", + "value": "2" } } }, { - "version": 6, + "version": 4, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } }, @@ -467,7 +462,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "300000000000000" } @@ -475,14 +470,14 @@ Response: { } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0xfe2a855cb35f7b1dea804e23c02d0c78cc0cc933e41b9d2e320eb1b00d7d322e", - "value": "2" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } } } @@ -491,8 +486,11 @@ Response: { } } } - } - ] + ] + } + }, + "before_obj_6_0_at_checkpoint_2": { + "nodes": [] } } } @@ -547,11 +545,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x3f1782ce8c0c6978931806a9da781f6e2af5cf448d673b709efc4c7a82c33d7c", + "value": "2" } } }, @@ -559,11 +557,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } } }, @@ -571,11 +569,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } }, @@ -583,11 +581,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0xfe2a855cb35f7b1dea804e23c02d0c78cc0cc933e41b9d2e320eb1b00d7d322e", - "value": "2" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } } } @@ -605,50 +603,50 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x0258afe9337053eb70d2ea746669d74d210e99511518b6636a5e8658859769d8", - "value": "0" + "id": "0x3f1782ce8c0c6978931806a9da781f6e2af5cf448d673b709efc4c7a82c33d7c", + "value": "2" } } }, { - "version": 6, + "version": 4, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x36cd3155591495e28382976b4de50469e46276d04da364d81ab729b65354d043", - "value": "3" + "id": "0x68dc6dbfb50db8a5dbcb67f5ddead9631ed0e568ab72395d3b96fa94e173c2fb", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0x4450c9a3c87cd72cc0fdf874dc80686c9f11bf7f830cbbf10bdb8c9d07229ddf", - "value": "1" + "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "value": "0" } } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xe60791b8245c8890ebcd25d12a451ea681dd47c384c048a6ccb29ade8a29c2ae::M1::Object" + "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" }, "json": { - "id": "0xfe2a855cb35f7b1dea804e23c02d0c78cc0cc933e41b9d2e320eb1b00d7d322e", - "value": "2" + "id": "0x949715b8f28d88feef6437802ff38945216f98cbc01103b43951dfaceb73bf6b", + "value": "3" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp index 5ba87a871df..b2d173a1ef1 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp @@ -35,27 +35,27 @@ task 6, lines 38-66: Response: { "data": { "after_obj_3_0": { + "objects": { + "nodes": [] + } + }, + "before_obj_3_0": { "objects": { "nodes": [ { "version": 4, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", "value": "100" } } } ] } - }, - "before_obj_3_0": { - "objects": { - "nodes": [] - } } } } @@ -74,27 +74,27 @@ task 9, lines 72-101: Response: { "data": { "after_obj_3_0_chkpt_1": { + "objects": { + "nodes": [] + } + }, + "before_obj_3_0_chkpt_1": { "objects": { "nodes": [ { "version": 4, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", "value": "100" } } } ] } - }, - "before_obj_3_0_chkpt_1": { - "objects": { - "nodes": [] - } } } } @@ -107,26 +107,26 @@ Response: { "objects": { "nodes": [ { - "version": 4, + "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0x7fd1be44922c6465d05261081f228a98883cdbebdc610b372894d5eedac04af6", - "value": "1" + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", + "value": "200" } } }, { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", - "value": "200" + "id": "0xc2aa8769eed4876c12133f3c27ed88b563516ffc2f3a2fa778a5b71be27a5707", + "value": "1" } } } @@ -134,16 +134,21 @@ Response: { } }, "after_obj_3_0_chkpt_2": { + "consistent_with_above": { + "nodes": [] + } + }, + "before_obj_3_0_chkpt_2": { "consistent_with_above": { "nodes": [ { "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", "value": "200" } }, @@ -152,26 +157,26 @@ Response: { "objects": { "nodes": [ { - "version": 4, + "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0x7fd1be44922c6465d05261081f228a98883cdbebdc610b372894d5eedac04af6", - "value": "1" + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", + "value": "200" } } }, { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", - "value": "200" + "id": "0xc2aa8769eed4876c12133f3c27ed88b563516ffc2f3a2fa778a5b71be27a5707", + "value": "1" } } } @@ -182,11 +187,6 @@ Response: { } ] } - }, - "before_obj_3_0_chkpt_2": { - "consistent_with_above": { - "nodes": [] - } } } } @@ -205,16 +205,21 @@ task 13, lines 184-247: Response: { "data": { "after_obj_3_0_chkpt_2": { + "objects": { + "nodes": [] + } + }, + "before_obj_3_0_chkpt_2": { "objects": { "nodes": [ { "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", "value": "200" } }, @@ -223,26 +228,26 @@ Response: { "objects": { "nodes": [ { - "version": 4, + "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0x7fd1be44922c6465d05261081f228a98883cdbebdc610b372894d5eedac04af6", - "value": "1" + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", + "value": "200" } } }, { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", - "value": "200" + "id": "0xc2aa8769eed4876c12133f3c27ed88b563516ffc2f3a2fa778a5b71be27a5707", + "value": "1" } } } @@ -253,11 +258,6 @@ Response: { } ] } - }, - "before_obj_3_0_chkpt_2": { - "objects": { - "nodes": [] - } } } } @@ -270,26 +270,26 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0x7fd1be44922c6465d05261081f228a98883cdbebdc610b372894d5eedac04af6", - "value": "300" + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", + "value": "200" } } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", - "value": "200" + "id": "0xc2aa8769eed4876c12133f3c27ed88b563516ffc2f3a2fa778a5b71be27a5707", + "value": "300" } } } @@ -297,16 +297,21 @@ Response: { } }, "after_obj_3_0_chkpt_3": { + "consistent_with_above": { + "nodes": [] + } + }, + "before_obj_3_0_chkpt_3": { "consistent_with_above": { "nodes": [ { "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", "value": "200" } }, @@ -315,26 +320,26 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0x7fd1be44922c6465d05261081f228a98883cdbebdc610b372894d5eedac04af6", - "value": "300" + "id": "0x70a218ebdd94a84e662e269cf623d8c2c68b8859cb66e7b50d0bdeda206fc8d6", + "value": "200" } } }, { - "version": 5, + "version": 6, "contents": { "type": { - "repr": "0xf349599494469367ef732c17778cbdb8c9cb1b60e022b80bbcf61cb4897d2cc9::M1::Object" + "repr": "0x9f37d89e27bf8dc20d31c05451728538ee4e7c465cc4a8f5ea9c87715fddb94b::M1::Object" }, "json": { - "id": "0xc7889c8f4e5c2853d7e18f916c8d795728086b5899a4b17278978ebd741cd442", - "value": "200" + "id": "0xc2aa8769eed4876c12133f3c27ed88b563516ffc2f3a2fa778a5b71be27a5707", + "value": "300" } } } @@ -345,11 +350,6 @@ Response: { } ] } - }, - "before_obj_3_0_chkpt_3": { - "consistent_with_above": { - "nodes": [] - } } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp index 7821d35e5db..f8fb4f3dd51 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp @@ -35,11 +35,11 @@ Response: { }, "contents": { "json": { - "id": "0xff6b496dbf122382b17c1b1ec2510feb9ec51241aa2c924e3721ed1771eb66ed", - "value": "330" + "id": "0xffadbf9a140531e4b8cad9f4447ad38c426c0726b594263f1c7e35ed6754a57f", + "value": "168" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -54,11 +54,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -76,11 +76,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe476a6a9382017f454d5954d8e1f4dab2548eca7dfd30d3a2b68759f857de57", - "value": "432" + "id": "0xfebebc8c6e18ae385a277d049f628e617c2eec2678fa3993cab8c12f0f57139a", + "value": "461" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } }, @@ -92,11 +92,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe96c7d99c112324b14e1ba80a70401c4d332f7c713550e2ffbcebc864c656a5", - "value": "253" + "id": "0xff243d8f814153210f94547f618b62cb834639513f672084d76abb7ba9fe4d60", + "value": "183" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } }, @@ -108,11 +108,11 @@ Response: { }, "contents": { "json": { - "id": "0xff6b496dbf122382b17c1b1ec2510feb9ec51241aa2c924e3721ed1771eb66ed", - "value": "330" + "id": "0xffadbf9a140531e4b8cad9f4447ad38c426c0726b594263f1c7e35ed6754a57f", + "value": "168" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } }, @@ -124,11 +124,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -163,7 +163,7 @@ Contents: Test::M1::Object { bytes: fake(2,498), }, }, - value: 330u64, + value: 168u64, } task 9, line 93: @@ -176,7 +176,7 @@ Contents: Test::M1::Object { bytes: fake(2,497), }, }, - value: 253u64, + value: 183u64, } task 10, line 95: @@ -199,11 +199,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe96c7d99c112324b14e1ba80a70401c4d332f7c713550e2ffbcebc864c656a5", - "value": "253" + "id": "0xff243d8f814153210f94547f618b62cb834639513f672084d76abb7ba9fe4d60", + "value": "183" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -218,11 +218,11 @@ Response: { }, "contents": { "json": { - "id": "0xff6b496dbf122382b17c1b1ec2510feb9ec51241aa2c924e3721ed1771eb66ed", - "value": "330" + "id": "0xffadbf9a140531e4b8cad9f4447ad38c426c0726b594263f1c7e35ed6754a57f", + "value": "168" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -237,11 +237,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -260,11 +260,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe476a6a9382017f454d5954d8e1f4dab2548eca7dfd30d3a2b68759f857de57", - "value": "432" + "id": "0xfebebc8c6e18ae385a277d049f628e617c2eec2678fa3993cab8c12f0f57139a", + "value": "461" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -287,11 +287,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -305,11 +305,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -325,11 +325,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe96c7d99c112324b14e1ba80a70401c4d332f7c713550e2ffbcebc864c656a5", - "value": "253" + "id": "0xff243d8f814153210f94547f618b62cb834639513f672084d76abb7ba9fe4d60", + "value": "183" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -343,11 +343,11 @@ Response: { }, "contents": { "json": { - "id": "0xff6b496dbf122382b17c1b1ec2510feb9ec51241aa2c924e3721ed1771eb66ed", - "value": "330" + "id": "0xffadbf9a140531e4b8cad9f4447ad38c426c0726b594263f1c7e35ed6754a57f", + "value": "168" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -361,11 +361,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -383,11 +383,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe96c7d99c112324b14e1ba80a70401c4d332f7c713550e2ffbcebc864c656a5", - "value": "253" + "id": "0xff243d8f814153210f94547f618b62cb834639513f672084d76abb7ba9fe4d60", + "value": "183" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -401,11 +401,11 @@ Response: { }, "contents": { "json": { - "id": "0xff6b496dbf122382b17c1b1ec2510feb9ec51241aa2c924e3721ed1771eb66ed", - "value": "330" + "id": "0xffadbf9a140531e4b8cad9f4447ad38c426c0726b594263f1c7e35ed6754a57f", + "value": "168" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -419,11 +419,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } @@ -442,7 +442,7 @@ Response: { }, "contents": { "json": { - "id": "0x9dbc88f03fbfa51b5ad6898b36d9184473d05f1b0d30333c535d0fcb4d49b994", + "id": "0x1eb9c07be9ad54e3fed9039563eeed1ba3cf80ef0e06215d0bc4a6bbc0407f47", "balance": { "value": "300000000000000" } @@ -461,11 +461,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe96c7d99c112324b14e1ba80a70401c4d332f7c713550e2ffbcebc864c656a5", - "value": "253" + "id": "0xff243d8f814153210f94547f618b62cb834639513f672084d76abb7ba9fe4d60", + "value": "183" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } }, @@ -478,11 +478,11 @@ Response: { }, "contents": { "json": { - "id": "0xff6b496dbf122382b17c1b1ec2510feb9ec51241aa2c924e3721ed1771eb66ed", - "value": "330" + "id": "0xffadbf9a140531e4b8cad9f4447ad38c426c0726b594263f1c7e35ed6754a57f", + "value": "168" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } }, @@ -495,11 +495,11 @@ Response: { }, "contents": { "json": { - "id": "0xffbe9379a37c07fd73150d9e48e007c6654c6443436af64924c6ba6a284735d1", - "value": "307" + "id": "0xffe43ee50e82cb2dc5ee557d18a94a2e5fe09bacc3cac4ae7d8ddbcda0369586", + "value": "344" }, "type": { - "repr": "0x2f820bef796e15cafaeb819be9f7dd2d7847e5cd9d6353a96c3a6018d4f2d249::M1::Object" + "repr": "0x384bd9b921168eb66108f785dc212ea22ed5a6b1d8e7b293629419f4c5b5f8b8::M1::Object" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp index 482cf468c82..1632733ba3a 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp @@ -25,11 +25,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 3, line 25: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [233, 207, 22, 117, 92, 142, 77, 109, 192, 159, 55, 48, 51, 243, 196, 130, 69, 227, 174, 117, 15, 72, 135, 76, 78, 53, 195, 204, 77, 84, 130, 131, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } -created: object(3,0), object(3,1) -mutated: 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) -deleted: object(_), object(2,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [113, 46, 167, 11, 73, 79, 224, 115, 15, 153, 192, 13, 230, 100, 50, 11, 13, 241, 164, 202, 132, 194, 237, 40, 198, 71, 76, 50, 158, 198, 79, 45, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +created: object(3,0) +mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) +deleted: object(2,0) +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 4, line 27: //# create-checkpoint @@ -49,11 +49,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 7, line 35: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(6,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [233, 207, 22, 117, 92, 142, 77, 109, 192, 159, 55, 48, 51, 243, 196, 130, 69, 227, 174, 117, 15, 72, 135, 76, 78, 53, 195, 204, 77, 84, 130, 131, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [113, 46, 167, 11, 73, 79, 224, 115, 15, 153, 192, 13, 230, 100, 50, 11, 13, 241, 164, 202, 132, 194, 237, 40, 198, 71, 76, 50, 158, 198, 79, 45, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(7,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(6,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 14257600, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 14219600, non_refundable_storage_fee: 0 task 8, line 37: //# create-checkpoint @@ -109,13 +109,13 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "ILTOB6NvCqXx1bHJbIx7P4fDLYSvut1t00nu514tp5J9BAAAAAAAAAA=", + "cursor": "INFzfBOi0K6gcaf9MAP41jJTqfT75nyCBRtNR+8uycuABAAAAAAAAAA=", "node": { "principal": "10000000000" } }, { - "cursor": "IOnE7aJU6U1Isae47+9Q/LjemKofCkTn6xN5WNNmjvrdBAAAAAAAAAA=", + "cursor": "IOFRhKuQ9+XsvWYaeU/qy3NMVgjRyldSOWcvxzU4yUDGBAAAAAAAAAA=", "node": { "principal": "10000000000" } @@ -166,7 +166,7 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "ILTOB6NvCqXx1bHJbIx7P4fDLYSvut1t00nu514tp5J9AwAAAAAAAAA=", + "cursor": "INFzfBOi0K6gcaf9MAP41jJTqfT75nyCBRtNR+8uycuAAwAAAAAAAAA=", "node": { "principal": "10000000000" } @@ -178,7 +178,7 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "IOnE7aJU6U1Isae47+9Q/LjemKofCkTn6xN5WNNmjvrdAwAAAAAAAAA=", + "cursor": "IOFRhKuQ9+XsvWYaeU/qy3NMVgjRyldSOWcvxzU4yUDGAwAAAAAAAAA=", "node": { "principal": "10000000000" } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp index 1c19a13fa61..7954f230ee6 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp @@ -61,66 +61,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -136,66 +136,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -209,66 +209,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -284,7 +284,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "299999993067600" } @@ -306,66 +306,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -390,66 +390,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -463,66 +463,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -538,7 +538,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "300000000000000" } @@ -557,66 +557,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -630,66 +630,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -705,7 +705,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "299999996697200" } @@ -724,66 +724,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -797,66 +797,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -872,7 +872,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "299999993067600" } @@ -907,66 +907,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -982,66 +982,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1055,66 +1055,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1130,7 +1130,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x9da8198f4378eca1871757f889a063e3e3a1a552fc797267a701aa0c82f6b680", + "id": "0x8ab48ef6556e6682bbd9ccd37b5cdcaf8f2974cf05b496385ea834684acbc08d", "balance": { "value": "299999993067600" } @@ -1152,66 +1152,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1240,66 +1240,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1313,66 +1313,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1388,66 +1388,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1461,66 +1461,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1536,66 +1536,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } @@ -1609,66 +1609,66 @@ Response: { { "contents": { "json": { - "id": "0x0a507f8a603f8431cce07f1e60d17881ce747dfcc8b9c24a2d6807deb37101ce", - "value": "5" + "id": "0x390a528a4a4811712e17ca86f90eee1c3a9916e7bd41407096fff0b106d4183f", + "value": "200" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2938d6b60f2b12193916aa014580060f2a9dfc71bcbeeb93877790ac03a7cd0c", + "id": "0x44df753d18b868b17fcf5bcb37fe005c40e9aa08a5b7383d058ac5f8e7631eac", "value": "4" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x2e3299fcac2580392087459adfb6cf19b1119c70e374a817bb82572a43c617c7", - "value": "200" + "id": "0x545e470174c3758a4d00ca07383f070af7687abbe2996aef811ab21c8556a73e", + "value": "6" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x7dccde2025181ded38d74712316b9e895fea91416e2c6fece98ab81a7f2feaa4", - "value": "3" + "id": "0x62187b6c767199622fd3e9e78e9e20f2db267c835bdf1b92fb8a00ff543be8aa", + "value": "5" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0x97c68bfbc11acf399e750ad156194bf934b261952ce1dc251494471138521ec4", - "value": "2" + "id": "0x992d53f230a1b54177880be2af91aa2738e744145ccc65ed771e0c9edb751e5c", + "value": "3" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } }, { "contents": { "json": { - "id": "0xde730de2672d23259fb9d179736de5c2262eac616ba4aa947c79f7493dc4edbb", - "value": "6" + "id": "0xa751024cb5b561abc363798734b56d99bd7189f4a32f5ad1878b0ffe7cdcdf04", + "value": "2" }, "type": { - "repr": "0x204efe51de22563b6bb6dec618af36f29dc881247ee04b11f816a2ea35e1de44::M1::Object" + "repr": "0x39bddad62ed0731f547835f9913585dfc9906961c1ea03962ea0027295b7bcb5::M1::Object" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp index 642c3cd09ce..f57a7125a72 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp @@ -11,6 +11,6 @@ task 2, lines 10-13: //# run-graphql Response: { "data": { - "chainIdentifier": "157e9367" + "chainIdentifier": "3df407de" } } diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp index ea58f7249c7..2b9349d9d92 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp @@ -21,11 +21,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, lines 17-19: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [233, 207, 22, 117, 92, 142, 77, 109, 192, 159, 55, 48, 51, 243, 196, 130, 69, 227, 174, 117, 15, 72, 135, 76, 78, 53, 195, 204, 77, 84, 130, 131, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [113, 46, 167, 11, 73, 79, 224, 115, 15, 153, 192, 13, 230, 100, 50, 11, 13, 241, 164, 202, 132, 194, 237, 40, 198, 71, 76, 50, 158, 198, 79, 45, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 5, line 20: //# create-checkpoint @@ -67,11 +67,11 @@ Response: { ] }, "validatorCandidatesSize": 0, - "inactivePoolsId": "0xccb58847e6337f3f9b05773365f62f7187e0b805ece63f932e8270e51188a9e0" + "inactivePoolsId": "0x81221b735025bfe8ef59e0dc06dea76f13de5051dfaec0708978cf16ebea4995" }, "totalGasFees": "1000000", "totalStakeRewards": "767000000000000", - "fundSize": "14561600", + "fundSize": "14523600", "fundInflow": "1976000", "fundOutflow": "988000", "netInflow": "988000", @@ -81,7 +81,7 @@ Response: { "kind": { "__typename": "ProgrammableTransactionBlock" }, - "digest": "o5rxrq6e35THRZTrCB1LM3nVC7r4sM4vaeSBzDzhE6R" + "digest": "5MwLDpwa5GKTi73WuUdRY1WjpLXXNKxUmwV82ct5fJgD" }, { "kind": { diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp index d8d8c3e4c25..0cb833f19c9 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp @@ -21,11 +21,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, line 19: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [141, 194, 182, 191, 13, 223, 31, 163, 140, 181, 81, 55, 49, 228, 140, 195, 208, 123, 162, 48, 172, 111, 154, 21, 33, 5, 186, 53, 41, 60, 215, 132, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [236, 239, 73, 206, 232, 121, 63, 28, 231, 209, 232, 243, 86, 9, 197, 247, 145, 30, 100, 212, 80, 242, 51, 192, 11, 211, 206, 92, 104, 134, 207, 151, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 5, line 21: //# create-checkpoint @@ -61,11 +61,11 @@ Epoch advanced: 3 task 12, line 37: //# run 0x3::iota_system::request_withdraw_stake --args object(0x5) object(4,0) --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [141, 194, 182, 191, 13, 223, 31, 163, 140, 181, 81, 55, 49, 228, 140, 195, 208, 123, 162, 48, 172, 111, 154, 21, 33, 5, 186, 53, 41, 60, 215, 132, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [236, 239, 73, 206, 232, 121, 63, 28, 231, 209, 232, 243, 86, 9, 197, 247, 145, 30, 100, 212, 80, 242, 51, 192, 11, 211, 206, 92, 104, 134, 207, 151, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] } created: object(12,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(4,0) -gas summary: computation_cost: 1000000, storage_cost: 14257600, storage_rebate: 14561600, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14219600, storage_rebate: 14523600, non_refundable_storage_fee: 0 task 13, line 39: //# create-checkpoint @@ -99,7 +99,7 @@ Response: { "epochId": 4, "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "15245600", + "totalObjectStorageRebates": "15207600", "nonRefundableBalance": "0" } } @@ -114,7 +114,7 @@ Response: { "epochId": 3, "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "15549600", + "totalObjectStorageRebates": "15511600", "nonRefundableBalance": "0" } } @@ -129,7 +129,7 @@ Response: { "epochId": 2, "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "14561600", + "totalObjectStorageRebates": "14523600", "nonRefundableBalance": "0" } } @@ -144,7 +144,7 @@ Response: { "epochId": 1, "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "14561600", + "totalObjectStorageRebates": "14523600", "nonRefundableBalance": "0" } } @@ -159,7 +159,7 @@ Response: { "epochId": 4, "systemStateVersion": 1, "storageFund": { - "totalObjectStorageRebates": "15245600", + "totalObjectStorageRebates": "15207600", "nonRefundableBalance": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp index 42d3ab05ce5..2a854b8238d 100644 --- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp +++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp @@ -77,67 +77,67 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callU8' (line 30), abort 'ImAU8': 0" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callU8' (line 30), abort 'ImAU8': 0" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callU16' (line 33), abort 'ImAU16': 1" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callU16' (line 33), abort 'ImAU16': 1" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callU32' (line 36), abort 'ImAU32': 2" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callU32' (line 36), abort 'ImAU32': 2" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callU64' (line 39), abort 'ImAU64': 3" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callU64' (line 39), abort 'ImAU64': 3" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callU128' (line 42), abort 'ImAU128': 4" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callU128' (line 42), abort 'ImAU128': 4" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callU256' (line 45), abort 'ImAU256': 5" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callU256' (line 45), abort 'ImAU256': 5" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callString' (line 51), abort 'ImAString': This is a string" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callString' (line 51), abort 'ImAString': This is a string" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA=" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA=" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::normalAbort' (instruction 1), abort code: 0" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::normalAbort' (instruction 1), abort code: 0" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x1803af073fdd925c6531abdeac9a6970139e99522f1c51b3d8ee19f9ecf97a53::m::assertLineNo' (line 60)" + "errors": "Error in 1st command, from '0x3a127250f84cd2115990d7e21166a89b48e3a6d82ff48f472c053ecfba771956::m::assertLineNo' (line 60)" } } ] @@ -248,7 +248,7 @@ Response: { }, "errors": [ { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -264,7 +264,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -280,7 +280,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -296,7 +296,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -312,7 +312,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -328,7 +328,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -344,7 +344,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -360,7 +360,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, @@ -376,7 +376,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 9a1632bc40f410b1c232035381c32fa7d17da47d861dbcc83837abdfed6d142d", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 032c2a219c60c86bcfcf3dd5c25800be43faf0364779e026fef2c6cb5ad6e3cb", "locations": [ { "line": 6, diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp index f93b4ed10e6..9b2db66a1a9 100644 --- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp +++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp @@ -37,19 +37,19 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x091f35449748beed874ae0236724fa6793ecac06e84c2008e37537d0cecd94ec::m::t_a' (line 21)" + "errors": "Error in 1st command, from '0x7fc708149402a59e73a6f48fbbcaf7e47a20a589ee9e80df026cf6daa2afc83f::m::t_a' (line 21)" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x091f35449748beed874ae0236724fa6793ecac06e84c2008e37537d0cecd94ec::m::t_calls_a' (line 24)" + "errors": "Error in 1st command, from '0x7fc708149402a59e73a6f48fbbcaf7e47a20a589ee9e80df026cf6daa2afc83f::m::t_calls_a' (line 24)" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x091f35449748beed874ae0236724fa6793ecac06e84c2008e37537d0cecd94ec::m::t_const_assert' (line 10), abort 'EMsg': This is a string" + "errors": "Error in 1st command, from '0x7fc708149402a59e73a6f48fbbcaf7e47a20a589ee9e80df026cf6daa2afc83f::m::t_const_assert' (line 10), abort 'EMsg': This is a string" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp index c0cbd080bff..30571bc9884 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp @@ -62,7 +62,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventA" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -80,7 +80,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventB<0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::Object>" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventB<0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -98,7 +98,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M2::EventA" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M2::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -116,7 +116,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M2::EventB<0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M2::Object>" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M2::EventB<0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M2::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -145,7 +145,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventA" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -163,7 +163,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventB<0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::Object>" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventB<0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -181,7 +181,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M2::EventA" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M2::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -199,7 +199,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M2::EventB<0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M2::Object>" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M2::EventB<0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M2::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -228,7 +228,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventA" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -246,7 +246,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventB<0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::Object>" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventB<0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -275,7 +275,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventA" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -304,7 +304,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::EventB<0x4e7fc229c08ef64b7f9149318b3ede4bfd3aa0a8b5fb0c1a1c1339e90bb38a80::M1::Object>" + "repr": "0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::EventB<0x29a1c355c38741d2e446eb51b4cf4efc3b0849feb16d6ee76d2f2f56aa805685::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp index d2dd26e9b7c..8389e5d2029 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp @@ -30,7 +30,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0x0d89bcf2cce9440c1c24fe316ab44e3149f852bb47714bd088d318fff135b772::M1::EventA" + "repr": "0x748febf330d2da6b122d67b5a8cbb5bd05ec0271c64138376014b45ef697b92e::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -56,7 +56,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0x0d89bcf2cce9440c1c24fe316ab44e3149f852bb47714bd088d318fff135b772::M1::EventA" + "repr": "0x748febf330d2da6b122d67b5a8cbb5bd05ec0271c64138376014b45ef697b92e::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -102,7 +102,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0x0d89bcf2cce9440c1c24fe316ab44e3149f852bb47714bd088d318fff135b772::M1::EventA" + "repr": "0x748febf330d2da6b122d67b5a8cbb5bd05ec0271c64138376014b45ef697b92e::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp index 973bfc67972..85f01cc62ab 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp @@ -33,12 +33,12 @@ Response: { "nodes": [ { "json": { - "id": "0x9541b2c72dd79fda1356a14f2c65a3236d9fa8690f91e52bf8f24b39fa636e36" + "id": "0xd87c135de4946d377a52a3a65a1fd20fffa433b3b99052fe453e0031f599f6b5" } }, { "json": { - "id": "0x9541b2c72dd79fda1356a14f2c65a3236d9fa8690f91e52bf8f24b39fa636e36", + "id": "0xd87c135de4946d377a52a3a65a1fd20fffa433b3b99052fe453e0031f599f6b5", "version": 1, "fields": { "contents": [ diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp index fdc46c72775..c3bea6eb550 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp @@ -42,7 +42,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -60,7 +60,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -78,7 +78,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -111,7 +111,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -129,7 +129,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -162,7 +162,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -180,7 +180,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -213,7 +213,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -231,7 +231,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0x1f57915ce0ae42aa219f3cc99dc4c285414b0df9ffdac98c0eb944c64c1cd4ad::M1::EventA" + "repr": "0xd3ad4e5fdec5936b440897773cfb609b87d8268870396be1881c8fb47a38d7e0::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp index 3cacae4e1e1..96d8f6096b4 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp @@ -37,19 +37,19 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "5kxKxJyFgHd4UJ5hRdDAqFKpxQ2By93WD5QBirmGxV5G" + "digest": "DBknzPQttLLFSS1hvFAFpLxyRfQoTJ4DfLQmLUWHopNA" }, { - "digest": "3VvtCtpFF6d1xVP8MaxQG1jKhGMwztHkgmr4oxFQvwQB" + "digest": "5R4XExD1LcfHpvoheRE5bRmakaZUBz1PMHexRckShSnY" }, { - "digest": "GmxLBE86X53MRMtMSsrvT7jQNgP2WUm58f2vTUmnWCmb" + "digest": "ADcdTqEyDzcv4aVQf4xXvZeVDEifikTAteHyzrdtamyK" }, { - "digest": "D8JKWZpfXiixotdWiU4U8gFsMP1zqytn67BrcmMcs8Ta" + "digest": "DB9UReZUc6j5gwFWUYe4mrtXKXxoxM3zhozS88RTYnWh" }, { - "digest": "BocKaPfQva3uSbuNjdWjQ7L8PGT3QH5TMENKyM4Tk6y9" + "digest": "F6Z9xa3mAZq9M52DMq3xYx1tBGwgWK4aJRnHqFjPfaiP" } ] } @@ -61,24 +61,7 @@ task 7, lines 46-58: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "2" - } - } - }, - { - "cursor": "eyJ0eCI6MywiZSI6MSwiYyI6MX0", - "node": { - "json": { - "new_value": "3" - } - } - } - ] + "edges": [] } } } @@ -108,24 +91,7 @@ task 10, lines 93-105: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "4" - } - } - }, - { - "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0", - "node": { - "json": { - "new_value": "5" - } - } - } - ] + "edges": [] } } } @@ -135,16 +101,7 @@ task 11, lines 107-119: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0", - "node": { - "json": { - "new_value": "5" - } - } - } - ] + "edges": [] } } } @@ -154,24 +111,7 @@ task 12, lines 122-134: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "2" - } - } - }, - { - "cursor": "eyJ0eCI6MywiZSI6MSwiYyI6MX0", - "node": { - "json": { - "new_value": "3" - } - } - } - ] + "edges": [] } } } @@ -181,16 +121,7 @@ task 13, lines 136-149: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "2" - } - } - } - ] + "edges": [] } } } @@ -210,24 +141,7 @@ task 15, lines 169-181: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "4" - } - } - }, - { - "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0", - "node": { - "json": { - "new_value": "5" - } - } - } - ] + "edges": [] } } } @@ -237,16 +151,7 @@ task 16, lines 183-195: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "4" - } - } - } - ] + "edges": [] } } } @@ -256,24 +161,7 @@ task 17, lines 197-210: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "2" - } - } - }, - { - "cursor": "eyJ0eCI6MywiZSI6MSwiYyI6MX0", - "node": { - "json": { - "new_value": "3" - } - } - } - ] + "edges": [] } } } @@ -283,24 +171,7 @@ task 18, lines 212-225: Response: { "data": { "events": { - "edges": [ - { - "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0", - "node": { - "json": { - "new_value": "4" - } - } - }, - { - "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0", - "node": { - "json": { - "new_value": "5" - } - } - } - ] + "edges": [] } } } diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp index aece0c3370a..2e5a66242ab 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp @@ -30,7 +30,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M1::EventA" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -72,7 +72,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M1::EventA" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -98,7 +98,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M2::EventB" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -124,7 +124,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M1::EventA" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -139,7 +139,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M2::EventB" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -165,7 +165,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M1::EventA" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -180,7 +180,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M2::EventB" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -195,7 +195,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0x2bed8b3b7c1c1f4946172f829fb3543392313644354882477a5db7ab2ce42d61::M2::EventB" + "repr": "0x4f531b4f6055db85656053d7be0fc772d86384df5a91bb4708641f7b25403786::M2::EventB" }, "sender": { "address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp index 24528c6fd89..48f578f36c7 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp @@ -38,19 +38,19 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "5kxKxJyFgHd4UJ5hRdDAqFKpxQ2By93WD5QBirmGxV5G" + "digest": "DBknzPQttLLFSS1hvFAFpLxyRfQoTJ4DfLQmLUWHopNA" }, { - "digest": "BEXbvgKWGQhMvS1PoV2a7c2Wgr3dfK229ir5Ubkfhm8o" + "digest": "4rtrE9DbavzLMcCiBZvLZxVZAMdwjnpbXYuaBXW7eTND" }, { - "digest": "AzMRRSR2Uu39kRnpNZQDAs7Mg9rfo57uZn4zk7D8n9Ly" + "digest": "5pT3cxDWnBgPZs1ag9P4N4TVpqCsuHUPUgTiH9KarFw8" }, { - "digest": "5ZnHMJYaowR9GX7j6uUbeJgDqDUwk8z5j9d5QeZ87w3E" + "digest": "3S6uPjmaRq3kALQNrW6uLSiv2ng8xT8HhmURbs2TiTcD" }, { - "digest": "tqCdKSzTf2AtDS5QwSup41Vr1kSGtzUMWZuAgKNHRNu" + "digest": "AU9uhc1MNN4UDkdMZLfXTMrQ8nmaeeP1ABeTiquG6q9t" } ] } @@ -65,7 +65,7 @@ Response: { "nodes": [ { "type": { - "repr": "0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::EventA<0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::T1>" + "repr": "0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::EventA<0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -78,7 +78,7 @@ Response: { }, { "type": { - "repr": "0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::EventA<0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::T2>" + "repr": "0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::EventA<0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::T2>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -91,7 +91,7 @@ Response: { }, { "type": { - "repr": "0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::EventA<0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::T1>" + "repr": "0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::EventA<0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -104,7 +104,7 @@ Response: { }, { "type": { - "repr": "0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::EventA<0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::T2>" + "repr": "0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::EventA<0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::T2>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -128,7 +128,7 @@ Response: { "nodes": [ { "type": { - "repr": "0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::EventA<0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::T1>" + "repr": "0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::EventA<0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -141,7 +141,7 @@ Response: { }, { "type": { - "repr": "0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::EventA<0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::T1>" + "repr": "0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::EventA<0xa9d0046410d0fc376765577ab4cc8cedeb757c31023a7f7681213bd701d588dc::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -162,21 +162,7 @@ task 9, lines 80-95: Response: { "data": { "events": { - "nodes": [ - { - "type": { - "repr": "0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::EventA<0x2792abbe5866e4e9d048ea7b9a41fe13b198b4fdf6e3d8b68032e4b9e1065de9::M1::T2>" - }, - "sender": { - "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" - }, - "json": { - "value": { - "dummy_field": false - } - } - } - ] + "nodes": [] } } } diff --git a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp index 6bb7821a67a..2d498d3d79c 100644 --- a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp +++ b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp @@ -73,7 +73,7 @@ task 5, lines 59-63: //# run-graphql Response: { "data": { - "chainIdentifier": "157e9367" + "chainIdentifier": "3df407de" } } @@ -81,7 +81,7 @@ task 6, lines 65-69: //# run-graphql Response: { "data": { - "chainIdentifier": "157e9367" + "chainIdentifier": "3df407de" } } diff --git a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp index e3788b7ca7e..dee0b69fab9 100644 --- a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp +++ b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp @@ -30,7 +30,7 @@ Response: { "edges": [ { "node": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } } ] @@ -59,7 +59,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } } ] @@ -91,7 +91,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } } ] @@ -100,7 +100,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } } ] @@ -132,7 +132,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } } ] @@ -164,7 +164,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } } ] @@ -190,7 +190,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } } ] @@ -216,7 +216,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx", + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu", "first": null, "last": null } @@ -243,7 +243,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx", + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu", "first": null, "last": null } @@ -270,7 +270,7 @@ Response: { "edges": [ { "txns": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx", + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu", "a": null, "b": null } @@ -324,7 +324,7 @@ Response: { "edges": [ { "node": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx", + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu", "a": null } } @@ -350,14 +350,14 @@ Response: { "fragmentSpread": { "nodes": [ { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } ] }, "inlineFragment": { "nodes": [ { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp index 022776bd296..1f14e8c8289 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp @@ -21,9 +21,9 @@ Response: { "iotaCoins": { "edges": [ { - "cursor": "ICYbB8yabwJpJa85NV5Ml4hbZwmh+Dk5u4oYwCdRHhXHAQAAAAAAAAA=", + "cursor": "IEYVx06mMnllj+aK7vKwG40lf89kaEtS5IA8cjwqyNj0AQAAAAAAAAA=", "node": { - "coinBalance": "30000000000000000", + "coinBalance": "299999983336400", "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" @@ -32,9 +32,9 @@ Response: { } }, { - "cursor": "IHqyduB7yB08AKw/UjTM5yFLXmn1y/oHU18UsF7spVl8AQAAAAAAAAA=", + "cursor": "IGpyc47NXUGOmfT+Ma01SrqId1WCkjmLhEXT8qpCL7/eAQAAAAAAAAA=", "node": { - "coinBalance": "299999983336400", + "coinBalance": "300000000000000", "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" @@ -43,9 +43,9 @@ Response: { } }, { - "cursor": "IJxCLHjKRKWXWqm27erPobYKzVvMRQ7CDLAEbIXhMbSaAQAAAAAAAAA=", + "cursor": "IMY/VHoF610diL+S4rDBIGpW2PIF5LCX4kV0OZpMnPj3AQAAAAAAAAA=", "node": { - "coinBalance": "300000000000000", + "coinBalance": "30000000000000000", "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" @@ -58,34 +58,34 @@ Response: { "fakeCoins": { "edges": [ { - "cursor": "IDfBTpW4Gk9r2WwLe6RXhCU3QV4gHvosomQcJvbaQ6WeAQAAAAAAAAA=", + "cursor": "IIkARQIHuR5pKC/zFdJt6iFDddGRKXjJqPyshWwT8le3AQAAAAAAAAA=", "node": { - "coinBalance": "2", + "coinBalance": "3", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0a47ea4347bcd024df307a10bbe264c358b63f74fab5346285ee912ba2fc89ea::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0b29b6207050f41c4f820e2b1ec2245bc3f980ed8c419596b0e1806b3e5bb5d3::fake::FAKE>" } } } }, { - "cursor": "IHdmN4tiqKqMTphDhbKuNxyBkFvllV5nvqX1AUHP7Af/AQAAAAAAAAA=", + "cursor": "II6lndpynZXqD25CwsOGCvI+i9DPwWN8luViudAEwAttAQAAAAAAAAA=", "node": { - "coinBalance": "1", + "coinBalance": "2", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0a47ea4347bcd024df307a10bbe264c358b63f74fab5346285ee912ba2fc89ea::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0b29b6207050f41c4f820e2b1ec2245bc3f980ed8c419596b0e1806b3e5bb5d3::fake::FAKE>" } } } }, { - "cursor": "INbHCg0pGQzm8VcanOqukxcfJzpPDcf0k17AapNHLVpwAQAAAAAAAAA=", + "cursor": "IPIZqNLJpWC0mUaf6ozfFWfKKV/UpP3vvcjOY9MyAULcAQAAAAAAAAA=", "node": { - "coinBalance": "3", + "coinBalance": "1", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0a47ea4347bcd024df307a10bbe264c358b63f74fab5346285ee912ba2fc89ea::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0b29b6207050f41c4f820e2b1ec2245bc3f980ed8c419596b0e1806b3e5bb5d3::fake::FAKE>" } } } @@ -96,7 +96,7 @@ Response: { "coins": { "edges": [ { - "cursor": "IHqyduB7yB08AKw/UjTM5yFLXmn1y/oHU18UsF7spVl8AQAAAAAAAAA=", + "cursor": "IEYVx06mMnllj+aK7vKwG40lf89kaEtS5IA8cjwqyNj0AQAAAAAAAAA=", "node": { "coinBalance": "299999983336400", "contents": { @@ -121,10 +121,10 @@ Response: { } }, { - "cursor": "eyJ0IjoiMHgwYTQ3ZWE0MzQ3YmNkMDI0ZGYzMDdhMTBiYmUyNjRjMzU4YjYzZjc0ZmFiNTM0NjI4NWVlOTEyYmEyZmM4OWVhOjpmYWtlOjpGQUtFIiwiYyI6MX0", + "cursor": "eyJ0IjoiMHgwYjI5YjYyMDcwNTBmNDFjNGY4MjBlMmIxZWMyMjQ1YmMzZjk4MGVkOGM0MTk1OTZiMGUxODA2YjNlNWJiNWQzOjpmYWtlOjpGQUtFIiwiYyI6MX0", "node": { "coinType": { - "repr": "0x0a47ea4347bcd024df307a10bbe264c358b63f74fab5346285ee912ba2fc89ea::fake::FAKE" + "repr": "0x0b29b6207050f41c4f820e2b1ec2245bc3f980ed8c419596b0e1806b3e5bb5d3::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "6" @@ -142,7 +142,7 @@ Response: { "lastBalance": { "edges": [ { - "cursor": "eyJ0IjoiMHgwYTQ3ZWE0MzQ3YmNkMDI0ZGYzMDdhMTBiYmUyNjRjMzU4YjYzZjc0ZmFiNTM0NjI4NWVlOTEyYmEyZmM4OWVhOjpmYWtlOjpGQUtFIiwiYyI6MX0" + "cursor": "eyJ0IjoiMHgwYjI5YjYyMDcwNTBmNDFjNGY4MjBlMmIxZWMyMjQ1YmMzZjk4MGVkOGM0MTk1OTZiMGUxODA2YjNlNWJiNWQzOjpmYWtlOjpGQUtFIiwiYyI6MX0" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/data.exp b/crates/iota-graphql-e2e-tests/tests/objects/data.exp index 491781fc00b..15b275a8fcd 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/data.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/data.exp @@ -36,7 +36,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x93f1f903184fdc131833e33aa92b9cd064d9acf6a6ed6f90fca16acec8eb8008::m::Foo" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "data": { "Struct": [ @@ -44,38 +44,38 @@ Response: { "name": "id", "value": { "UID": [ - 156, - 66, - 44, - 120, - 202, - 68, - 165, - 151, - 90, - 169, - 182, - 237, - 234, - 207, - 161, - 182, - 10, + 106, + 114, + 115, + 142, 205, - 91, - 204, - 69, - 14, - 194, - 12, - 176, - 4, - 108, - 133, - 225, + 93, + 65, + 142, + 153, + 244, + 254, 49, - 180, - 154 + 173, + 53, + 74, + 186, + 136, + 119, + 85, + 130, + 146, + 57, + 139, + 132, + 69, + 211, + 242, + 170, + 66, + 47, + 191, + 222 ] } }, @@ -95,7 +95,7 @@ Response: { ] }, "json": { - "id": "0x9c422c78ca44a5975aa9b6edeacfa1b60acd5bcc450ec20cb0046c85e131b49a", + "id": "0x6a72738ecd5d418e99f4fe31ad354aba8877558292398b8445d3f2aa422fbfde", "balance": { "value": "299999988454400" } @@ -109,7 +109,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0efae4c4ef97efbff02076010b775c6bd3f97c5d6d3506f4097825c9b6cc136a::m::Foo" + "repr": "0x0f67d8cbf985b27c76b05ba409aa34fc894dd5f60b4f1e536e639a0e354ff821::m::Foo" }, "data": { "Struct": [ @@ -117,38 +117,38 @@ Response: { "name": "id", "value": { "UID": [ - 164, - 17, - 213, - 232, - 47, - 31, - 112, - 148, - 198, - 194, - 58, - 105, - 83, - 52, - 194, - 18, - 45, - 68, - 30, - 182, - 62, - 88, - 186, - 87, - 247, + 136, 96, - 70, - 82, - 4, - 3, + 91, + 32, + 162, + 5, + 225, + 221, + 192, + 193, + 80, + 227, + 39, + 20, 72, - 43 + 44, + 237, + 215, + 101, + 228, + 73, + 218, + 169, + 233, + 11, + 14, + 243, + 226, + 58, + 74, + 171, + 86 ] } }, @@ -156,38 +156,38 @@ Response: { "name": "f0", "value": { "ID": [ - 164, - 17, - 213, - 232, - 47, - 31, - 112, - 148, - 198, - 194, - 58, - 105, - 83, - 52, - 194, - 18, - 45, - 68, - 30, - 182, - 62, - 88, - 186, - 87, - 247, + 136, 96, - 70, - 82, - 4, - 3, + 91, + 32, + 162, + 5, + 225, + 221, + 192, + 193, + 80, + 227, + 39, + 20, 72, - 43 + 44, + 237, + 215, + 101, + 228, + 73, + 218, + 169, + 233, + 11, + 14, + 243, + 226, + 58, + 74, + 171, + 86 ] } }, @@ -227,38 +227,38 @@ Response: { "Vector": [ { "Address": [ - 164, - 17, - 213, - 232, - 47, - 31, - 112, - 148, - 198, - 194, - 58, - 105, - 83, - 52, - 194, - 18, - 45, - 68, - 30, - 182, - 62, - 88, - 186, - 87, - 247, + 136, 96, - 70, - 82, - 4, - 3, + 91, + 32, + 162, + 5, + 225, + 221, + 192, + 193, + 80, + 227, + 39, + 20, 72, - 43 + 44, + 237, + 215, + 101, + 228, + 73, + 218, + 169, + 233, + 11, + 14, + 243, + 226, + 58, + 74, + 171, + 86 ] } ] @@ -275,94 +275,21 @@ Response: { ] }, "json": { - "id": "0xa411d5e82f1f7094c6c23a695334c2122d441eb63e58ba57f76046520403482b", - "f0": "0xa411d5e82f1f7094c6c23a695334c2122d441eb63e58ba57f76046520403482b", + "id": "0x88605b20a205e1ddc0c150e32714482cedd765e449daa9e90b0ef3e23a4aab56", + "f0": "0x88605b20a205e1ddc0c150e32714482cedd765e449daa9e90b0ef3e23a4aab56", "f1": true, "f2": 42, "f3": "43", "f4": "hello", "f5": "world", "f6": [ - "0xa411d5e82f1f7094c6c23a695334c2122d441eb63e58ba57f76046520403482b" + "0x88605b20a205e1ddc0c150e32714482cedd765e449daa9e90b0ef3e23a4aab56" ], "f7": 44 } } } } - }, - { - "outputState": { - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" - }, - "data": { - "Struct": [ - { - "name": "id", - "value": { - "UID": [ - 199, - 193, - 22, - 26, - 220, - 133, - 210, - 252, - 134, - 136, - 182, - 46, - 220, - 224, - 251, - 151, - 55, - 138, - 191, - 239, - 75, - 27, - 135, - 168, - 86, - 166, - 178, - 57, - 127, - 180, - 225, - 202 - ] - } - }, - { - "name": "balance", - "value": { - "Struct": [ - { - "name": "value", - "value": { - "Number": "299999988454400" - } - } - ] - } - } - ] - }, - "json": { - "id": "0xc7c1161adc85d2fc8688b62edce0fb97378abfef4b1b87a856a6b2397fb4e1ca", - "balance": { - "value": "299999988454400" - } - } - } - } - } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/display.exp b/crates/iota-graphql-e2e-tests/tests/objects/display.exp index 30438e439e3..08be6054d22 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/display.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/display.exp @@ -5,7 +5,7 @@ A: object(0,0) task 1, lines 7-131: //# publish --sender A -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [79, 141, 203, 153, 57, 55, 108, 120, 194, 53, 199, 30, 160, 171, 249, 41, 24, 66, 59, 90, 24, 118, 129, 144, 208, 225, 134, 169, 17, 34, 56, 99] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [138, 255, 202, 80, 41, 165, 128, 30, 3, 161, 239, 241, 121, 232, 34, 66, 77, 170, 247, 197, 71, 162, 132, 158, 132, 94, 64, 209, 23, 64, 30, 169] } created: object(1,0), object(1,1), object(1,2) mutated: object(0,0) gas summary: computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 @@ -16,7 +16,7 @@ Checkpoint created: 1 task 3, line 135: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 1, content_digest: 9F7c2TgpqEJgQfpoZVgrShGJY6hDy4w7V72tDsYGmFdA, +CheckpointSummary { epoch: 0, seq: 1, content_digest: 8WNfNSjU2RrY7CfFZZ7tpim1EDL2sXMpzQxYShG7GdyA, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 }} task 4, line 137: @@ -27,7 +27,7 @@ gas summary: computation_cost: 1000000, storage_cost: 3556800, storage_rebate: task 5, line 139: //# run Test::boars::update_display_faulty --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [79, 141, 203, 153, 57, 55, 108, 120, 194, 53, 199, 30, 160, 171, 249, 41, 24, 66, 59, 90, 24, 118, 129, 144, 208, 225, 134, 169, 17, 34, 56, 99, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [138, 255, 202, 80, 41, 165, 128, 30, 3, 161, 239, 241, 121, 232, 34, 66, 77, 170, 247, 197, 71, 162, 132, 158, 132, 94, 64, 209, 23, 64, 30, 169, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 2941200, storage_rebate: 2652400, non_refundable_storage_fee: 0 @@ -37,7 +37,7 @@ Checkpoint created: 2 task 7, line 143: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 2, content_digest: FesnkK13c6BpGeE4gdZA7y3mH6wCYPTen1PWBeH7HyAj, +CheckpointSummary { epoch: 0, seq: 2, content_digest: 7eXt8A8kpNGH3UUUCJ8kuMy6192vxhQXpH4hVvj6oeDj, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 3000000, storage_cost: 27968000, storage_rebate: 3640400, non_refundable_storage_fee: 0 }} task 8, lines 145-158: @@ -74,7 +74,7 @@ Response: { task 9, line 160: //# run Test::boars::single_add --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [79, 141, 203, 153, 57, 55, 108, 120, 194, 53, 199, 30, 160, 171, 249, 41, 24, 66, 59, 90, 24, 118, 129, 144, 208, 225, 134, 169, 17, 34, 56, 99, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [138, 255, 202, 80, 41, 165, 128, 30, 3, 161, 239, 241, 121, 232, 34, 66, 77, 170, 247, 197, 71, 162, 132, 158, 132, 94, 64, 209, 23, 64, 30, 169, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 3032400, storage_rebate: 2941200, non_refundable_storage_fee: 0 @@ -84,7 +84,7 @@ Checkpoint created: 3 task 11, line 164: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 3, content_digest: GieDkngnP3zKqAVwq9Z3dzLV3SFxQSF6MCzLRTR21a1Y, +CheckpointSummary { epoch: 0, seq: 3, content_digest: FspPwUpC8NtwNgENDodqyssbFpYYwnKdUcnQBx3Y39xT, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 4000000, storage_cost: 31000400, storage_rebate: 6581600, non_refundable_storage_fee: 0 }} task 12, lines 166-179: @@ -126,7 +126,7 @@ Response: { task 13, line 181: //# run Test::boars::multi_add --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [79, 141, 203, 153, 57, 55, 108, 120, 194, 53, 199, 30, 160, 171, 249, 41, 24, 66, 59, 90, 24, 118, 129, 144, 208, 225, 134, 169, 17, 34, 56, 99, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [138, 255, 202, 80, 41, 165, 128, 30, 3, 161, 239, 241, 121, 232, 34, 66, 77, 170, 247, 197, 71, 162, 132, 158, 132, 94, 64, 209, 23, 64, 30, 169, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 5236400, storage_rebate: 3032400, non_refundable_storage_fee: 0 @@ -136,7 +136,7 @@ Checkpoint created: 4 task 15, line 185: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 4, content_digest: GejuPGmwpDZZsYHjhdWhgd7iUEbmLptrvyeEDG3vDfnv, +CheckpointSummary { epoch: 0, seq: 4, content_digest: AWbcFx4iaKYUgEriiMo4EYrQoqewkVSD9WVTYK3YinxQ, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 5000000, storage_cost: 36236800, storage_rebate: 9614000, non_refundable_storage_fee: 0 }} task 16, lines 187-200: @@ -195,7 +195,7 @@ Response: { }, { "key": "project_url", - "value": "Unique Boar from the Boars collection with First Boar and 0x10f5201cbbe803388e1b03c7a6836c655639f67c8f14a742e9119e9fb4286e58", + "value": "Unique Boar from the Boars collection with First Boar and 0x9afba5bb3265e2aa4faab673791015343aa20a715d884d1f8d8a3e6a63d432b8", "error": null }, { diff --git a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp index 6f1b7fab628..aecdb9c3ec0 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp @@ -36,7 +36,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0xbc9658781cb63be50f8df25d28690777e9f756684b2b4fdfed5d88609f5c06b1::m::Foo" + "repr": "0xbd90a1e29b15ea9dbac80be2ea82e1e46cf63f14f2f0187f551e9843c4e31309::m::Foo" }, "data": { "Struct": [ @@ -44,38 +44,38 @@ Response: { "name": "id", "value": { "UID": [ + 91, + 76, + 59, + 98, + 133, + 29, + 176, + 16, + 122, + 45, + 227, + 98, + 96, + 118, + 40, + 151, + 246, + 253, + 62, 148, - 127, - 206, - 36, - 57, - 139, - 230, + 26, + 194, 19, - 69, - 97, - 203, - 64, - 214, - 243, - 96, - 16, - 59, - 31, - 219, - 220, - 158, - 217, - 81, - 135, - 126, - 8, - 233, + 53, + 172, + 201, + 170, + 3, + 157, + 102, 88, - 40, - 255, - 71, - 12 + 34 ] } }, @@ -83,38 +83,38 @@ Response: { "name": "f0", "value": { "ID": [ + 91, + 76, + 59, + 98, + 133, + 29, + 176, + 16, + 122, + 45, + 227, + 98, + 96, + 118, + 40, + 151, + 246, + 253, + 62, 148, - 127, - 206, - 36, - 57, - 139, - 230, + 26, + 194, 19, - 69, - 97, - 203, - 64, - 214, - 243, - 96, - 16, - 59, - 31, - 219, - 220, - 158, - 217, - 81, - 135, - 126, - 8, - 233, + 53, + 172, + 201, + 170, + 3, + 157, + 102, 88, - 40, - 255, - 71, - 12 + 34 ] } }, @@ -154,38 +154,38 @@ Response: { "Vector": [ { "Address": [ + 91, + 76, + 59, + 98, + 133, + 29, + 176, + 16, + 122, + 45, + 227, + 98, + 96, + 118, + 40, + 151, + 246, + 253, + 62, 148, - 127, - 206, - 36, - 57, - 139, - 230, + 26, + 194, 19, - 69, - 97, - 203, - 64, - 214, - 243, - 96, - 16, - 59, - 31, - 219, - 220, - 158, - 217, - 81, - 135, - 126, - 8, - 233, + 53, + 172, + 201, + 170, + 3, + 157, + 102, 88, - 40, - 255, - 71, - 12 + 34 ] } ] @@ -252,15 +252,15 @@ Response: { ] }, "json": { - "id": "0x947fce24398be6134561cb40d6f360103b1fdbdc9ed951877e08e95828ff470c", - "f0": "0x947fce24398be6134561cb40d6f360103b1fdbdc9ed951877e08e95828ff470c", + "id": "0x5b4c3b62851db0107a2de36260762897f6fd3e941ac21335acc9aa039d665822", + "f0": "0x5b4c3b62851db0107a2de36260762897f6fd3e941ac21335acc9aa039d665822", "f1": true, "f2": 42, "f3": "43", "f4": "hello", "f5": "world", "f6": [ - "0x947fce24398be6134561cb40d6f360103b1fdbdc9ed951877e08e95828ff470c" + "0x5b4c3b62851db0107a2de36260762897f6fd3e941ac21335acc9aa039d665822" ], "f7": 44, "f8": { @@ -297,38 +297,38 @@ Response: { "name": "id", "value": { "UID": [ - 156, - 66, - 44, - 120, - 202, - 68, - 165, - 151, - 90, - 169, - 182, - 237, - 234, - 207, - 161, - 182, - 10, + 106, + 114, + 115, + 142, 205, - 91, - 204, - 69, - 14, - 194, - 12, - 176, - 4, - 108, - 133, - 225, + 93, + 65, + 142, + 153, + 244, + 254, 49, - 180, - 154 + 173, + 53, + 74, + 186, + 136, + 119, + 85, + 130, + 146, + 57, + 139, + 132, + 69, + 211, + 242, + 170, + 66, + 47, + 191, + 222 ] } }, @@ -348,7 +348,7 @@ Response: { ] }, "json": { - "id": "0x9c422c78ca44a5975aa9b6edeacfa1b60acd5bcc450ec20cb0046c85e131b49a", + "id": "0x6a72738ecd5d418e99f4fe31ad354aba8877558292398b8445d3f2aa422fbfde", "balance": { "value": "299999995967600" } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp index eac5623a25b..e39a57a6002 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp @@ -21,11 +21,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, lines 16-18: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [233, 207, 22, 117, 92, 142, 77, 109, 192, 159, 55, 48, 51, 243, 196, 130, 69, 227, 174, 117, 15, 72, 135, 76, 78, 53, 195, 204, 77, 84, 130, 131, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [113, 46, 167, 11, 73, 79, 224, 115, 15, 153, 192, 13, 230, 100, 50, 11, 13, 241, 164, 202, 132, 194, 237, 40, 198, 71, 76, 50, 158, 198, 79, 45, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 5, line 19: //# create-checkpoint @@ -129,17 +129,6 @@ Response: { } } }, - { - "node": { - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" - } - } - } - } - }, { "node": { "asMoveObject": { @@ -156,7 +145,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -178,7 +167,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" } } } @@ -189,7 +178,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -200,7 +189,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -211,7 +200,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -233,7 +222,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -244,7 +233,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" } } } @@ -255,7 +244,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -266,7 +255,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -310,7 +299,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -321,7 +310,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp index 17bc4f00ee5..0d6197f9a6a 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp @@ -48,19 +48,19 @@ Response: { "objects": { "edges": [ { - "cursor": "IEDSk627fQsytn/ikdGQtF3KwSuu/naEpKOvuirYJ5m0AQAAAAAAAAA=" + "cursor": "IFk/QPIjZfFor0LpNhl7TyBbDLpjrTSHGTPgtRZq55RMAQAAAAAAAAA=" }, { - "cursor": "IFGKFT9PZ8JOjuvml92sXxsJ7bILPYFp+HnbpIuVbiMBAQAAAAAAAAA=" + "cursor": "IFrLvoP1TxQSmRZuu9CgcJEjM6pDURhzYTRtUhy6hXLGAQAAAAAAAAA=" }, { - "cursor": "IH16DW3lpd8N1iV4jvbm8kALVovmI+sl+VUeffpH8snwAQAAAAAAAAA=" + "cursor": "IGb/NapzDin9HCKp/IuRXYXeV2JjhztECM3GGXCMeU9nAQAAAAAAAAA=" }, { - "cursor": "IJ4etep87+xECxMt7pHa/nvzbxtgS/fPiZFOM3aFVgqAAQAAAAAAAAA=" + "cursor": "II4AFo6sy9O9NgsJ7a4Mk2+1w6TzGy9H19pL2+3tXnWUAQAAAAAAAAA=" }, { - "cursor": "INK0CTjfJeJxj9bteOyQhcLDgG2Pr3cfwDvII3tNj+XRAQAAAAAAAAA=" + "cursor": "IPBJZMFRy8KqXDB+RQFmBw3eURmjNSJMvLVfRUL198CXAQAAAAAAAAA=" } ] } @@ -76,10 +76,10 @@ Response: { "objects": { "edges": [ { - "cursor": "IEDSk627fQsytn/ikdGQtF3KwSuu/naEpKOvuirYJ5m0AQAAAAAAAAA=" + "cursor": "IFk/QPIjZfFor0LpNhl7TyBbDLpjrTSHGTPgtRZq55RMAQAAAAAAAAA=" }, { - "cursor": "IFGKFT9PZ8JOjuvml92sXxsJ7bILPYFp+HnbpIuVbiMBAQAAAAAAAAA=" + "cursor": "IFrLvoP1TxQSmRZuu9CgcJEjM6pDURhzYTRtUhy6hXLGAQAAAAAAAAA=" } ] } @@ -95,52 +95,52 @@ Response: { "objects": { "edges": [ { - "cursor": "IEDSk627fQsytn/ikdGQtF3KwSuu/naEpKOvuirYJ5m0AQAAAAAAAAA=", + "cursor": "IFk/QPIjZfFor0LpNhl7TyBbDLpjrTSHGTPgtRZq55RMAQAAAAAAAAA=", "node": { - "address": "0x40d293adbb7d0b32b67fe291d190b45dcac12baefe7684a4a3afba2ad82799b4" + "address": "0x593f40f22365f168af42e936197b4f205b0cba63ad34871933e0b5166ae7944c" } }, { - "cursor": "IFGKFT9PZ8JOjuvml92sXxsJ7bILPYFp+HnbpIuVbiMBAQAAAAAAAAA=", + "cursor": "IFrLvoP1TxQSmRZuu9CgcJEjM6pDURhzYTRtUhy6hXLGAQAAAAAAAAA=", "node": { - "address": "0x518a153f4f67c24e8eebe697ddac5f1b09edb20b3d8169f879dba48b956e2301" + "address": "0x5acbbe83f54f141299166ebbd0a070912333aa4351187361346d521cba8572c6" } }, { - "cursor": "IH16DW3lpd8N1iV4jvbm8kALVovmI+sl+VUeffpH8snwAQAAAAAAAAA=", + "cursor": "IGb/NapzDin9HCKp/IuRXYXeV2JjhztECM3GGXCMeU9nAQAAAAAAAAA=", "node": { - "address": "0x7d7a0d6de5a5df0dd625788ef6e6f2400b568be623eb25f9551e7dfa47f2c9f0" + "address": "0x66ff35aa730e29fd1c22a9fc8b915d85de576263873b4408cdc619708c794f67" } }, { - "cursor": "IJ4etep87+xECxMt7pHa/nvzbxtgS/fPiZFOM3aFVgqAAQAAAAAAAAA=", + "cursor": "II4AFo6sy9O9NgsJ7a4Mk2+1w6TzGy9H19pL2+3tXnWUAQAAAAAAAAA=", "node": { - "address": "0x9e1eb5ea7cefec440b132dee91dafe7bf36f1b604bf7cf89914e337685560a80" + "address": "0x8e00168eaccbd3bd360b09edae0c936fb5c3a4f31b2f47d7da4bdbeded5e7594" } }, { - "cursor": "INK0CTjfJeJxj9bteOyQhcLDgG2Pr3cfwDvII3tNj+XRAQAAAAAAAAA=", + "cursor": "IPBJZMFRy8KqXDB+RQFmBw3eURmjNSJMvLVfRUL198CXAQAAAAAAAAA=", "node": { - "address": "0xd2b40938df25e2718fd6ed78ec9085c2c3806d8faf771fc03bc8237b4d8fe5d1" + "address": "0xf04964c151cbc2aa5c307e450166070dde5119a335224cbcb55f4542f5f7c097" } } ] } }, "obj_3_0": { - "address": "0x40d293adbb7d0b32b67fe291d190b45dcac12baefe7684a4a3afba2ad82799b4" + "address": "0x8e00168eaccbd3bd360b09edae0c936fb5c3a4f31b2f47d7da4bdbeded5e7594" }, "obj_5_0": { - "address": "0xd2b40938df25e2718fd6ed78ec9085c2c3806d8faf771fc03bc8237b4d8fe5d1" + "address": "0x66ff35aa730e29fd1c22a9fc8b915d85de576263873b4408cdc619708c794f67" }, "obj_6_0": { - "address": "0x9e1eb5ea7cefec440b132dee91dafe7bf36f1b604bf7cf89914e337685560a80" + "address": "0x5acbbe83f54f141299166ebbd0a070912333aa4351187361346d521cba8572c6" }, "obj_4_0": { - "address": "0x518a153f4f67c24e8eebe697ddac5f1b09edb20b3d8169f879dba48b956e2301" + "address": "0x593f40f22365f168af42e936197b4f205b0cba63ad34871933e0b5166ae7944c" }, "obj_2_0": { - "address": "0x7d7a0d6de5a5df0dd625788ef6e6f2400b568be623eb25f9551e7dfa47f2c9f0" + "address": "0xf04964c151cbc2aa5c307e450166070dde5119a335224cbcb55f4542f5f7c097" } } } @@ -153,10 +153,10 @@ Response: { "objects": { "edges": [ { - "cursor": "IK9P5kG5iygq/7pjfX9SipiASf9hfMxiRORO+Bp7D8L3AQAAAAAAAAA=" + "cursor": "II4AFo6sy9O9NgsJ7a4Mk2+1w6TzGy9H19pL2+3tXnWUAQAAAAAAAAA=" }, { - "cursor": "IPLRWuZ7QWUTcRib/05Pr3QQPUG4BJKCLzfVN9rpJVdJAQAAAAAAAAA=" + "cursor": "IPBJZMFRy8KqXDB+RQFmBw3eURmjNSJMvLVfRUL198CXAQAAAAAAAAA=" } ] } @@ -172,7 +172,7 @@ Response: { "objects": { "edges": [ { - "cursor": "IH16DW3lpd8N1iV4jvbm8kALVovmI+sl+VUeffpH8snwAQAAAAAAAAA=" + "cursor": "IFrLvoP1TxQSmRZuu9CgcJEjM6pDURhzYTRtUhy6hXLGAQAAAAAAAAA=" } ] } @@ -186,7 +186,14 @@ Response: { "data": { "address": { "objects": { - "edges": [] + "edges": [ + { + "cursor": "IFrLvoP1TxQSmRZuu9CgcJEjM6pDURhzYTRtUhy6hXLGAQAAAAAAAAA=" + }, + { + "cursor": "IGb/NapzDin9HCKp/IuRXYXeV2JjhztECM3GGXCMeU9nAQAAAAAAAAA=" + } + ] } } } @@ -200,15 +207,15 @@ Response: { "objects": { "edges": [ { - "cursor": "IJ4etep87+xECxMt7pHa/nvzbxtgS/fPiZFOM3aFVgqAAQAAAAAAAAA=", + "cursor": "II4AFo6sy9O9NgsJ7a4Mk2+1w6TzGy9H19pL2+3tXnWUAQAAAAAAAAA=", "node": { - "address": "0x9e1eb5ea7cefec440b132dee91dafe7bf36f1b604bf7cf89914e337685560a80" + "address": "0x8e00168eaccbd3bd360b09edae0c936fb5c3a4f31b2f47d7da4bdbeded5e7594" } }, { - "cursor": "INK0CTjfJeJxj9bteOyQhcLDgG2Pr3cfwDvII3tNj+XRAQAAAAAAAAA=", + "cursor": "IPBJZMFRy8KqXDB+RQFmBw3eURmjNSJMvLVfRUL198CXAQAAAAAAAAA=", "node": { - "address": "0xd2b40938df25e2718fd6ed78ec9085c2c3806d8faf771fc03bc8237b4d8fe5d1" + "address": "0xf04964c151cbc2aa5c307e450166070dde5119a335224cbcb55f4542f5f7c097" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp index cda429bd0d7..afb8cc58389 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp @@ -37,7 +37,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x90fe12b6a159cd99f67000fb7102a692407cb182a97c5c47bbbd2013685e4e2f::m::Bar" + "repr": "0x854ef0e0488b45cf3046d2f84254609170633fa8b470d85f344d9468d8f0e092::m::Bar" } }, "hasPublicTransfer": false @@ -61,7 +61,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x90fe12b6a159cd99f67000fb7102a692407cb182a97c5c47bbbd2013685e4e2f::m::Foo" + "repr": "0x854ef0e0488b45cf3046d2f84254609170633fa8b470d85f344d9468d8f0e092::m::Foo" } }, "hasPublicTransfer": true diff --git a/crates/iota-graphql-e2e-tests/tests/objects/received.exp b/crates/iota-graphql-e2e-tests/tests/objects/received.exp index d12cb1a5b46..c26b4ffceb2 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/received.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/received.exp @@ -30,7 +30,7 @@ Response: { "receivedTransactionBlocks": { "nodes": [ { - "digest": "8Tpmc27hRrtKVmzNYax4GUjS9KjxV6gp6TWU85arSBuF" + "digest": "HDJ76CfsVvLgcbwmuEhFPeNozC2qJGosaNFd4UMXnHCK" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp index 36ea35aec35..f8fd30064b0 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp @@ -10,7 +10,7 @@ Response: { "objects": { "edges": [ { - "cursor": "ID2b/KDmn+mINf+fV2rpfJtyLKYwbJXgm/zNF3KeS3QhAAAAAAAAAAA=", + "cursor": "IJFHAqwsypkUwqnB2AOT7pnjeqIKHJxaaK6tWMIke+G7AAAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { @@ -39,11 +39,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 3, line 38: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [233, 207, 22, 117, 92, 142, 77, 109, 192, 159, 55, 48, 51, 243, 196, 130, 69, 227, 174, 117, 15, 72, 135, 76, 78, 53, 195, 204, 77, 84, 130, 131, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } -created: object(3,0), object(3,1) -mutated: 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) -deleted: object(_), object(2,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [113, 46, 167, 11, 73, 79, 224, 115, 15, 153, 192, 13, 230, 100, 50, 11, 13, 241, 164, 202, 132, 194, 237, 40, 198, 71, 76, 50, 158, 198, 79, 45, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +created: object(3,0) +mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) +deleted: object(2,0) +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 4, line 40: //# create-checkpoint @@ -60,34 +60,34 @@ Response: { "objects": { "edges": [ { - "cursor": "ID2b/KDmn+mINf+fV2rpfJtyLKYwbJXgm/zNF3KeS3QhAgAAAAAAAAA=", + "cursor": "IJFHAqwsypkUwqnB2AOT7pnjeqIKHJxaaK6tWMIke+G7AgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { "principal": "1500000000000000", - "poolId": "0xe9cf16755c8e4d6dc09f373033f3c48245e3ae750f48874c4e35c3cc4d548283" + "poolId": "0x712ea70b494fe0730f99c00de664320b0df1a4ca84c2ed28c6474c329ec64f2d" } } } }, { - "cursor": "IMqZuQSI1P4/w7vGb7cegyAhP7MlN0wtU6CPLPVuQweKAgAAAAAAAAA=", + "cursor": "ILVYziRMbmfeQ0alyypl2nA4gTpsnVI0/mNu+O2M0UcwAgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { "principal": "15340000000000", - "poolId": "0xe9cf16755c8e4d6dc09f373033f3c48245e3ae750f48874c4e35c3cc4d548283" + "poolId": "0x712ea70b494fe0730f99c00de664320b0df1a4ca84c2ed28c6474c329ec64f2d" } } } }, { - "cursor": "IOnE7aJU6U1Isae47+9Q/LjemKofCkTn6xN5WNNmjvrdAgAAAAAAAAA=", + "cursor": "INFzfBOi0K6gcaf9MAP41jJTqfT75nyCBRtNR+8uycuAAgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { "principal": "10000000000", - "poolId": "0xe9cf16755c8e4d6dc09f373033f3c48245e3ae750f48874c4e35c3cc4d548283" + "poolId": "0x712ea70b494fe0730f99c00de664320b0df1a4ca84c2ed28c6474c329ec64f2d" } } } @@ -98,7 +98,7 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "IOnE7aJU6U1Isae47+9Q/LjemKofCkTn6xN5WNNmjvrdAgAAAAAAAAA=", + "cursor": "INFzfBOi0K6gcaf9MAP41jJTqfT75nyCBRtNR+8uycuAAgAAAAAAAAA=", "node": { "principal": "10000000000" } diff --git a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp index b41f08d1d15..6aaf800a4bf 100644 --- a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp +++ b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp @@ -24,7 +24,7 @@ Response: { }, "coin": { "asObject": { - "digest": "CJYTW4TXXaEQJvcmgyenkLnWccpto2ydL5GsngYtKh6r" + "digest": "E2DAtnDfrNVsh9fxc3wzU4C9T7Q9MXScEmzNbxBdguJk" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp index 4b3f1605e94..094d87a20cf 100644 --- a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp +++ b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp @@ -124,10 +124,10 @@ Response: { "version": 11, "contents": { "json": { - "id": "0x929221e11df0175aa1eabad96d59c8d410b9d21b645aaf79d7dffe8a2ca6fd5e", + "id": "0x3d6bc055f015afb8f0152fe88f6ad026abde053c1881439251feec91df2abc5e", "count": "1", "wrapped": { - "id": "0xc63a859ad3565d14dd2a6e86727feeb50f7c83e8fd6ef0ba6060a27a987a6779", + "id": "0xd6529e9bdfbd3aa26eb762c83808d530fdbaea8203f0afad2bb9afb2da689bee", "count": "1" } } @@ -141,10 +141,10 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x929221e11df0175aa1eabad96d59c8d410b9d21b645aaf79d7dffe8a2ca6fd5e", + "id": "0x3d6bc055f015afb8f0152fe88f6ad026abde053c1881439251feec91df2abc5e", "count": "1", "wrapped": { - "id": "0xc63a859ad3565d14dd2a6e86727feeb50f7c83e8fd6ef0ba6060a27a987a6779", + "id": "0xd6529e9bdfbd3aa26eb762c83808d530fdbaea8203f0afad2bb9afb2da689bee", "count": "1" } } @@ -158,10 +158,10 @@ Response: { "version": 8, "contents": { "json": { - "id": "0x929221e11df0175aa1eabad96d59c8d410b9d21b645aaf79d7dffe8a2ca6fd5e", + "id": "0x3d6bc055f015afb8f0152fe88f6ad026abde053c1881439251feec91df2abc5e", "count": "1", "wrapped": { - "id": "0xc63a859ad3565d14dd2a6e86727feeb50f7c83e8fd6ef0ba6060a27a987a6779", + "id": "0xd6529e9bdfbd3aa26eb762c83808d530fdbaea8203f0afad2bb9afb2da689bee", "count": "0" } } @@ -175,10 +175,10 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x929221e11df0175aa1eabad96d59c8d410b9d21b645aaf79d7dffe8a2ca6fd5e", + "id": "0x3d6bc055f015afb8f0152fe88f6ad026abde053c1881439251feec91df2abc5e", "count": "0", "wrapped": { - "id": "0xc63a859ad3565d14dd2a6e86727feeb50f7c83e8fd6ef0ba6060a27a987a6779", + "id": "0xd6529e9bdfbd3aa26eb762c83808d530fdbaea8203f0afad2bb9afb2da689bee", "count": "0" } } @@ -199,7 +199,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x4ad8511fbee8662b83da22a400b18d49bf895a1bad9949f877664346cb778d6d", + "id": "0xa21fd54afe517081640256d1fc5234381795b5c3efff663a51646cf749c09da3", "count": "0" } } @@ -212,7 +212,7 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x4ad8511fbee8662b83da22a400b18d49bf895a1bad9949f877664346cb778d6d", + "id": "0xa21fd54afe517081640256d1fc5234381795b5c3efff663a51646cf749c09da3", "count": "1" } } @@ -225,7 +225,7 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x4ad8511fbee8662b83da22a400b18d49bf895a1bad9949f877664346cb778d6d", + "id": "0xa21fd54afe517081640256d1fc5234381795b5c3efff663a51646cf749c09da3", "count": "1" } } @@ -238,7 +238,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x4ad8511fbee8662b83da22a400b18d49bf895a1bad9949f877664346cb778d6d", + "id": "0xa21fd54afe517081640256d1fc5234381795b5c3efff663a51646cf749c09da3", "count": "0" } } @@ -251,7 +251,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x4ad8511fbee8662b83da22a400b18d49bf895a1bad9949f877664346cb778d6d", + "id": "0xa21fd54afe517081640256d1fc5234381795b5c3efff663a51646cf749c09da3", "count": "0" } } @@ -271,7 +271,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x4e0d15c4938faa6096532976870ea525d839acc4c009c31f1c91b2d583f0ca2a", + "id": "0x431e694b454be35e3f68c63b2cc498a7bff6eda011683b6edf33d0cb7cc3c1dc", "count": "0" } } @@ -284,7 +284,7 @@ Response: { "version": 11, "contents": { "json": { - "id": "0x4e0d15c4938faa6096532976870ea525d839acc4c009c31f1c91b2d583f0ca2a", + "id": "0x431e694b454be35e3f68c63b2cc498a7bff6eda011683b6edf33d0cb7cc3c1dc", "count": "1" } } @@ -297,7 +297,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x4e0d15c4938faa6096532976870ea525d839acc4c009c31f1c91b2d583f0ca2a", + "id": "0x431e694b454be35e3f68c63b2cc498a7bff6eda011683b6edf33d0cb7cc3c1dc", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp index ed011d80157..bc9c394335b 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp @@ -155,7 +155,7 @@ task 5, lines 73-97: Response: { "data": { "object": { - "address": "0x1cf6f19e22c23560433d84559c5eb7e454e90934f1cdbaf80c0217a3d41b7813", + "address": "0xce86ad0b402e015d9e37d599a66004ab87b4d47f443e6397ddd622fabb8505ca", "asMovePackage": { "module": { "datatypes": { @@ -190,7 +190,7 @@ task 6, lines 99-144: Response: { "data": { "object": { - "address": "0x1cf6f19e22c23560433d84559c5eb7e454e90934f1cdbaf80c0217a3d41b7813", + "address": "0xce86ad0b402e015d9e37d599a66004ab87b4d47f443e6397ddd622fabb8505ca", "asMovePackage": { "module": { "datatypes": { diff --git a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp index 9d1e1b8a447..92af10d46e1 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp @@ -25,13 +25,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x0db69147531907018e7ef8ffb915739dec59f5429d05c9185fbadb7611fc809e", + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", "asMovePackage": null } }, { "outputState": { - "address": "0x13ab44ee556ad8724e413be666922fa51857ffe553640a8a81a0b077a9454c49", + "address": "0x5495744f4c4aae2495bb8e9b242f377332dcd94ede651ec2e9f223fc42478c8d", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0xc1bc8df9fab221b99e4fdaca592186926e95e2ce70c8e871e0058d3a68a171f7", "asMovePackage": { "module": { "enum": { @@ -87,12 +93,6 @@ Response: { } } } - }, - { - "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "asMovePackage": null - } } ] } @@ -125,25 +125,13 @@ Response: { "nodes": [ { "outputState": { - "address": "0x0db69147531907018e7ef8ffb915739dec59f5429d05c9185fbadb7611fc809e", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xee91556fa4546eb038a6a74f34443839d75f83514c7eee2c567aac6ca5daca50", + "address": "0x057ee598c854881dee4b8c0eaeb3fdcda5a9ee204eedc8a8fb6238796e711d52", "asMovePackage": { "module": { "s": { "module": { "package": { - "address": "0x13ab44ee556ad8724e413be666922fa51857ffe553640a8a81a0b077a9454c49" + "address": "0xc1bc8df9fab221b99e4fdaca592186926e95e2ce70c8e871e0058d3a68a171f7" } }, "name": "S", @@ -198,7 +186,7 @@ Response: { "t": { "module": { "package": { - "address": "0xee91556fa4546eb038a6a74f34443839d75f83514c7eee2c567aac6ca5daca50" + "address": "0x057ee598c854881dee4b8c0eaeb3fdcda5a9ee204eedc8a8fb6238796e711d52" } }, "name": "T", @@ -228,12 +216,12 @@ Response: { { "name": "s", "type": { - "repr": "0x13ab44ee556ad8724e413be666922fa51857ffe553640a8a81a0b077a9454c49::m::S", + "repr": "0xc1bc8df9fab221b99e4fdaca592186926e95e2ce70c8e871e0058d3a68a171f7::m::S", "signature": { "ref": null, "body": { "datatype": { - "package": "0x13ab44ee556ad8724e413be666922fa51857ffe553640a8a81a0b077a9454c49", + "package": "0xc1bc8df9fab221b99e4fdaca592186926e95e2ce70c8e871e0058d3a68a171f7", "module": "m", "type": "S", "typeParameters": [] @@ -267,7 +255,7 @@ Response: { { "name": "t", "type": { - "repr": "0x13ab44ee556ad8724e413be666922fa51857ffe553640a8a81a0b077a9454c49::m::T<0x13ab44ee556ad8724e413be666922fa51857ffe553640a8a81a0b077a9454c49::m::S>" + "repr": "0xc1bc8df9fab221b99e4fdaca592186926e95e2ce70c8e871e0058d3a68a171f7::m::T<0xc1bc8df9fab221b99e4fdaca592186926e95e2ce70c8e871e0058d3a68a171f7::m::S>" } } ] @@ -277,6 +265,18 @@ Response: { } } } + }, + { + "outputState": { + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0x5495744f4c4aae2495bb8e9b242f377332dcd94ede651ec2e9f223fc42478c8d", + "asMovePackage": null + } } ] } @@ -297,16 +297,6 @@ Response: { "effects": { "objectChanges": { "nodes": [ - { - "outputState": { - "asMovePackage": null - } - }, - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -326,6 +316,16 @@ Response: { } } } + }, + { + "outputState": { + "asMovePackage": null + } + }, + { + "outputState": { + "asMovePackage": null + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp index 0cf467612b7..579783ff716 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp @@ -23,11 +23,6 @@ Response: { "effects": { "objectChanges": { "nodes": [ - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -102,6 +97,11 @@ Response: { } } }, + { + "outputState": { + "asMovePackage": null + } + }, { "outputState": { "asMovePackage": null @@ -128,14 +128,14 @@ Response: { "nodes": [ { "outputState": { - "asMovePackage": null + "asMovePackage": { + "module": null + } } }, { "outputState": { - "asMovePackage": { - "module": null - } + "asMovePackage": null } }, { @@ -166,7 +166,7 @@ Response: { "effects", "objectChanges", "nodes", - 1, + 0, "outputState", "asMovePackage", "module", @@ -189,11 +189,6 @@ Response: { "effects": { "objectChanges": { "nodes": [ - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -270,6 +265,11 @@ Response: { } } }, + { + "outputState": { + "asMovePackage": null + } + }, { "outputState": { "asMovePackage": null diff --git a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp index 184e066e9dc..4644ad5126e 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp @@ -95,25 +95,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", "asMovePackage": null } }, { "outputState": { - "address": "0xc1d3538ac73128faa829ebaa9b30627b579215e00c2e47960311bbd2d5086c09", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xf2091469462fa60ab4f96f0f5ef490f77890aae5fa8d485ab5f05d8fe6a9e5b3", + "address": "0x4648c14f9dbc3c5c3e44ffcdf94444cbd13c4f88af2a994c6f9a2295b4c7cd29", "asMovePackage": { "module": { "function": { "module": { "package": { - "address": "0xf2091469462fa60ab4f96f0f5ef490f77890aae5fa8d485ab5f05d8fe6a9e5b3" + "address": "0x4648c14f9dbc3c5c3e44ffcdf94444cbd13c4f88af2a994c6f9a2295b4c7cd29" } }, "name": "f", @@ -143,6 +137,12 @@ Response: { } } } + }, + { + "outputState": { + "address": "0xeffa5a0a25c236e776581f584992e565eb4f2262a9100c5591a3eaffb7689eff", + "asMovePackage": null + } } ] } @@ -175,13 +175,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x114752060737346a4ec7c59dac8629f83b1934589d8f085401d3bbd783bfba90", + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0x7f5985a0142a48e74b4272dcc829fc8ec62ddd4aebf5dc3a1b0595f25b4e75b3", "asMovePackage": { "module": { "f": { "module": { "package": { - "address": "0x114752060737346a4ec7c59dac8629f83b1934589d8f085401d3bbd783bfba90" + "address": "0x7f5985a0142a48e74b4272dcc829fc8ec62ddd4aebf5dc3a1b0595f25b4e75b3" } }, "name": "f", @@ -211,7 +217,7 @@ Response: { "g": { "module": { "package": { - "address": "0x114752060737346a4ec7c59dac8629f83b1934589d8f085401d3bbd783bfba90" + "address": "0x7f5985a0142a48e74b4272dcc829fc8ec62ddd4aebf5dc3a1b0595f25b4e75b3" } }, "name": "g", @@ -231,13 +237,7 @@ Response: { }, { "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xc1d3538ac73128faa829ebaa9b30627b579215e00c2e47960311bbd2d5086c09", + "address": "0xeffa5a0a25c236e776581f584992e565eb4f2262a9100c5591a3eaffb7689eff", "asMovePackage": null } } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp index f812edc1c62..169a7614ad6 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp @@ -22,25 +22,25 @@ Response: { "nodes": [ { "outputState": { - "address": "0x51e8c26146c1df0ca5c935c4e0b2d9a99ef83e9e201735f71e647f3b1255d56c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xa21b5f9202bbe1625bd3639eb01a88aa92b75343751327d1ba99f7044789cd7b", + "address": "0x32214fed35a06d7c7835ecb93e6202e2cb4df3a9f955ff8d288c76ca20fd3030", "asMovePackage": { "module": { "name": "m", "package": { - "address": "0xa21b5f9202bbe1625bd3639eb01a88aa92b75343751327d1ba99f7044789cd7b" + "address": "0x32214fed35a06d7c7835ecb93e6202e2cb4df3a9f955ff8d288c76ca20fd3030" }, "fileFormatVersion": 6, - "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVlohtfkgK74WJb02OesBqIqpK3U0N1EyfRupn3BEeJzXsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=", - "disassembly": "// Move bytecode v6\nmodule a21b5f9202bbe1625bd3639eb01a88aa92b75343751327d1ba99f7044789cd7b.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo(Arg0: u64, Arg1: &Coin): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin)\n\t1: Call coin::value(&Coin): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin)\n\t2: Call foo(u64, &Coin): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin)\n\t5: Call foo(u64, &Coin): u64\n\t6: Mul\n\t7: Ret\n\n}\n}" + "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVlMiFP7TWgbXx4Ney5PmIC4stN86n5Vf+NKIx2yiD9MDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=", + "disassembly": "// Move bytecode v6\nmodule 32214fed35a06d7c7835ecb93e6202e2cb4df3a9f955ff8d288c76ca20fd3030.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo(Arg0: u64, Arg1: &Coin): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin)\n\t1: Call coin::value(&Coin): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin)\n\t2: Call foo(u64, &Coin): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin)\n\t5: Call foo(u64, &Coin): u64\n\t6: Mul\n\t7: Ret\n\n}\n}" } } } + }, + { + "outputState": { + "address": "0x70870c0c96fcd9253d8b91a8e593008bf34bc4dd7392528ede52cd36e9961386", + "asMovePackage": null + } } ] } @@ -63,13 +63,7 @@ Response: { "nodes": [ { "outputState": { - "address": "0x51e8c26146c1df0ca5c935c4e0b2d9a99ef83e9e201735f71e647f3b1255d56c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xa21b5f9202bbe1625bd3639eb01a88aa92b75343751327d1ba99f7044789cd7b", + "address": "0x32214fed35a06d7c7835ecb93e6202e2cb4df3a9f955ff8d288c76ca20fd3030", "asMovePackage": { "all": { "edges": [ @@ -139,6 +133,12 @@ Response: { } } } + }, + { + "outputState": { + "address": "0x70870c0c96fcd9253d8b91a8e593008bf34bc4dd7392528ede52cd36e9961386", + "asMovePackage": null + } } ] } @@ -161,13 +161,7 @@ Response: { "nodes": [ { "outputState": { - "address": "0x51e8c26146c1df0ca5c935c4e0b2d9a99ef83e9e201735f71e647f3b1255d56c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xa21b5f9202bbe1625bd3639eb01a88aa92b75343751327d1ba99f7044789cd7b", + "address": "0x32214fed35a06d7c7835ecb93e6202e2cb4df3a9f955ff8d288c76ca20fd3030", "asMovePackage": { "prefix": { "edges": [ @@ -279,6 +273,12 @@ Response: { } } } + }, + { + "outputState": { + "address": "0x70870c0c96fcd9253d8b91a8e593008bf34bc4dd7392528ede52cd36e9961386", + "asMovePackage": null + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp index 09ca1e93224..d74b7bd74b0 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp @@ -154,19 +154,7 @@ Response: { "nodes": [ { "outputState": { - "address": "0x37256da94764212f98d6ad0e8127abfa76f1f162ef41d95418647d57e8eaca7a", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x9f6e2de5e33a325a9cdb4202adeef86f2f8b503595fcbf291a8c697e2ff8e8ce", + "address": "0x07a6360638e2c6ee0387536c538f2e3d86d79f540e21442c22546cf4b2cc818a", "asMovePackage": { "module": { "struct": { @@ -192,6 +180,18 @@ Response: { } } } + }, + { + "outputState": { + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0xdc5d27894ce68058f930efff3bd2ea07ac76e72c639da85bd8dd3821d8756ca5", + "asMovePackage": null + } } ] } @@ -224,13 +224,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x10be345598e39acb2359e836c0b9abc86e1d7f952964f32e94bc7df976af1639", + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0x9cb4a761ec67a3890caa0f5c347b030c25e6654c1bdaac45f0ecc47e9407e5cf", "asMovePackage": { "module": { "s": { "module": { "package": { - "address": "0x9f6e2de5e33a325a9cdb4202adeef86f2f8b503595fcbf291a8c697e2ff8e8ce" + "address": "0x07a6360638e2c6ee0387536c538f2e3d86d79f540e21442c22546cf4b2cc818a" } }, "name": "S", @@ -255,7 +261,7 @@ Response: { "t": { "module": { "package": { - "address": "0x10be345598e39acb2359e836c0b9abc86e1d7f952964f32e94bc7df976af1639" + "address": "0x9cb4a761ec67a3890caa0f5c347b030c25e6654c1bdaac45f0ecc47e9407e5cf" } }, "name": "T", @@ -282,12 +288,12 @@ Response: { { "name": "s", "type": { - "repr": "0x9f6e2de5e33a325a9cdb4202adeef86f2f8b503595fcbf291a8c697e2ff8e8ce::m::S", + "repr": "0x07a6360638e2c6ee0387536c538f2e3d86d79f540e21442c22546cf4b2cc818a::m::S", "signature": { "ref": null, "body": { "datatype": { - "package": "0x9f6e2de5e33a325a9cdb4202adeef86f2f8b503595fcbf291a8c697e2ff8e8ce", + "package": "0x07a6360638e2c6ee0387536c538f2e3d86d79f540e21442c22546cf4b2cc818a", "module": "m", "type": "S", "typeParameters": [] @@ -316,7 +322,7 @@ Response: { { "name": "t", "type": { - "repr": "0x9f6e2de5e33a325a9cdb4202adeef86f2f8b503595fcbf291a8c697e2ff8e8ce::m::T<0x9f6e2de5e33a325a9cdb4202adeef86f2f8b503595fcbf291a8c697e2ff8e8ce::m::S>" + "repr": "0x07a6360638e2c6ee0387536c538f2e3d86d79f540e21442c22546cf4b2cc818a::m::T<0x07a6360638e2c6ee0387536c538f2e3d86d79f540e21442c22546cf4b2cc818a::m::S>" } } ] @@ -327,13 +333,7 @@ Response: { }, { "outputState": { - "address": "0x37256da94764212f98d6ad0e8127abfa76f1f162ef41d95418647d57e8eaca7a", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", + "address": "0xdc5d27894ce68058f930efff3bd2ea07ac76e72c639da85bd8dd3821d8756ca5", "asMovePackage": null } } @@ -356,6 +356,11 @@ Response: { "effects": { "objectChanges": { "nodes": [ + { + "outputState": { + "asMovePackage": null + } + }, { "outputState": { "asMovePackage": { @@ -376,11 +381,6 @@ Response: { } } }, - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": null diff --git a/crates/iota-graphql-e2e-tests/tests/packages/types.exp b/crates/iota-graphql-e2e-tests/tests/packages/types.exp index 4e5af50b04f..c59198fc664 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/types.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/types.exp @@ -275,7 +275,7 @@ Response: { "data": null, "errors": [ { - "message": "Internal error occurred while processing request: Error calculating layout for 0xdd96816456c86fc4fc43a5befdf6bdde3192f61c386009b917c0d00302dd149c::m::S1: Type layout nesting exceeded limit of 128", + "message": "Internal error occurred while processing request: Error calculating layout for 0xce9a81f38a05563e6f9a9631bba81e2cab53a8991a5e4b23015e89a24681cf6a::m::S1: Type layout nesting exceeded limit of 128", "locations": [ { "line": 4, diff --git a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp index 4c2a051c2b5..023182ad5e5 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp @@ -31,14 +31,14 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 } ] } }, "firstPackage": { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1, "module": { "functions": { @@ -52,7 +52,7 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 } ] @@ -85,7 +85,7 @@ Response: { "version": 1 }, { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 } ] @@ -124,18 +124,18 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 } ] } }, "firstPackage": { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1, "module": { "functions": { @@ -149,11 +149,11 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 } ] @@ -186,11 +186,11 @@ Response: { "version": 1 }, { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 } ] @@ -232,22 +232,22 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 }, { - "address": "0xc9f52b52c53c55f1412d98e7cfa069c37a1af74dbf12fd3f0420400c7ee18d3c", + "address": "0x28e96bf81c1496060edfad5bd1061e7bc075411100cbd1a78e0bc4c4d86863ba", "version": 3 } ] } }, "firstPackage": { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1, "module": { "functions": { @@ -261,15 +261,15 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 }, { - "address": "0xc9f52b52c53c55f1412d98e7cfa069c37a1af74dbf12fd3f0420400c7ee18d3c", + "address": "0x28e96bf81c1496060edfad5bd1061e7bc075411100cbd1a78e0bc4c4d86863ba", "version": 3 } ] @@ -302,15 +302,15 @@ Response: { "version": 1 }, { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 }, { - "address": "0xc9f52b52c53c55f1412d98e7cfa069c37a1af74dbf12fd3f0420400c7ee18d3c", + "address": "0x28e96bf81c1496060edfad5bd1061e7bc075411100cbd1a78e0bc4c4d86863ba", "version": 3 } ] @@ -738,7 +738,7 @@ Response: { "after": { "nodes": [ { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2, "previousTransactionBlock": { "effects": { @@ -749,7 +749,7 @@ Response: { } }, { - "address": "0xc9f52b52c53c55f1412d98e7cfa069c37a1af74dbf12fd3f0420400c7ee18d3c", + "address": "0x28e96bf81c1496060edfad5bd1061e7bc075411100cbd1a78e0bc4c4d86863ba", "version": 3, "previousTransactionBlock": { "effects": { @@ -764,7 +764,7 @@ Response: { "between": { "nodes": [ { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2, "previousTransactionBlock": { "effects": { @@ -786,15 +786,15 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 }, { - "address": "0xc9f52b52c53c55f1412d98e7cfa069c37a1af74dbf12fd3f0420400c7ee18d3c", + "address": "0x28e96bf81c1496060edfad5bd1061e7bc075411100cbd1a78e0bc4c4d86863ba", "version": 3 } ] @@ -802,11 +802,11 @@ Response: { "after": { "nodes": [ { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 }, { - "address": "0xc9f52b52c53c55f1412d98e7cfa069c37a1af74dbf12fd3f0420400c7ee18d3c", + "address": "0x28e96bf81c1496060edfad5bd1061e7bc075411100cbd1a78e0bc4c4d86863ba", "version": 3 } ] @@ -814,11 +814,11 @@ Response: { "before": { "nodes": [ { - "address": "0x131afb2e02cb300d9b0c5c4c04ad792ca6e557fae7e6179d125580be4f3ba1f5", + "address": "0xbdee2771f5ac93d47921a88192b0f827d7d3d848bc9c969551ec12552f9431f7", "version": 1 }, { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 } ] @@ -826,7 +826,7 @@ Response: { "between": { "nodes": [ { - "address": "0xe59cf51865936dc000487a5672ad3b32b94f6ad8d4831b2b5d352e099540402a", + "address": "0xbdf1ce07c62205ab2a7d519b432e4889b1e93d1cd879cf277990bfd01b44ecfa", "version": 2 } ] diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp index 317bdf1bbe8..47bb696a887 100644 --- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp +++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp @@ -48,13 +48,13 @@ Response: { "edges": [ { "node": { - "amount": "2000" + "amount": "4000" }, "cursor": "eyJpIjowLCJjIjoyfQ" }, { "node": { - "amount": "1000" + "amount": "2000" }, "cursor": "eyJpIjoxLCJjIjoyfQ" }, @@ -66,19 +66,19 @@ Response: { }, { "node": { - "amount": "3000" + "amount": "5000" }, "cursor": "eyJpIjozLCJjIjoyfQ" }, { "node": { - "amount": "2000" + "amount": "3000" }, "cursor": "eyJpIjo0LCJjIjoyfQ" }, { "node": { - "amount": "4000" + "amount": "1000" }, "cursor": "eyJpIjo1LCJjIjoyfQ" } @@ -111,13 +111,13 @@ Response: { "edges": [ { "node": { - "amount": "3000" + "amount": "5000" }, "cursor": "eyJpIjozLCJjIjoxfQ" }, { "node": { - "amount": "2000" + "amount": "3000" }, "cursor": "eyJpIjo0LCJjIjoxfQ" } @@ -150,13 +150,13 @@ Response: { "edges": [ { "node": { - "amount": "2000" + "amount": "4000" }, "cursor": "eyJpIjowLCJjIjoxfQ" }, { "node": { - "amount": "1000" + "amount": "2000" }, "cursor": "eyJpIjoxLCJjIjoxfQ" }, diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp index 0ff47387599..5d1eb064ab6 100644 --- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp +++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp @@ -65,7 +65,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "FbcsxoLgm67eMhxSJRGFmfHjBbNCzL3BnjFZv3saDvKR", + "digest": "3NYWT6hz9kDRxxtauxCt8cM2hqQMLQnXehSXZVybqM64", "effects": { "dependencies": { "pageInfo": { @@ -78,26 +78,15 @@ Response: { { "cursor": "eyJpIjowLCJjIjoxfQ", "node": { - "digest": "6i44bwXAW6MXN7GAcqGCF7aYqP3G4MBENSLpdUr583B", + "digest": "PY3oKKfBZW7Q8mcMfBv9s9sb4ncu7xnxDb6nX8wbxY9", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { "nodes": [ + {}, { - "module": "M1", - "functionName": "sum" - }, - { - "module": "M1", - "functionName": "sum" - }, - { - "module": "M1", - "functionName": "sum" - }, - { - "module": "M1", - "functionName": "create" + "module": "package", + "functionName": "make_immutable" } ] } @@ -107,15 +96,26 @@ Response: { { "cursor": "eyJpIjoxLCJjIjoxfQ", "node": { - "digest": "5ihQLwkWokwDJhgsx7VxuBeivmkWEysWg8DXA9rK3Uum", + "digest": "9bKqgttdw88Yijri3PNLZwpWJYAHcuRu3979vPXcAhJG", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { "nodes": [ - {}, { - "module": "package", - "functionName": "make_immutable" + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "create" } ] } @@ -138,7 +138,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "FbcsxoLgm67eMhxSJRGFmfHjBbNCzL3BnjFZv3saDvKR", + "digest": "3NYWT6hz9kDRxxtauxCt8cM2hqQMLQnXehSXZVybqM64", "effects": { "dependencies": { "pageInfo": { @@ -151,15 +151,26 @@ Response: { { "cursor": "eyJpIjoxLCJjIjoxfQ", "node": { - "digest": "5ihQLwkWokwDJhgsx7VxuBeivmkWEysWg8DXA9rK3Uum", + "digest": "9bKqgttdw88Yijri3PNLZwpWJYAHcuRu3979vPXcAhJG", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { "nodes": [ - {}, { - "module": "package", - "functionName": "make_immutable" + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "create" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp index 9cdc0d06c2e..0cff552a78c 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp @@ -30,7 +30,7 @@ Response: { "c0": { "nodes": [ { - "digest": "JBuShctBdzAwMsiNHQnxTJqUhRuJgrTdUEyCbFc8S86L", + "digest": "9VbftUPfAUfiPvagdpqP7ZSuFiLt2ano5Y2bkNuKQqkf", "kind": { "__typename": "GenesisTransaction" } @@ -46,7 +46,7 @@ Response: { } }, { - "digest": "CgGRbLYTFKi8nSsm4UEsXR2FrJkZA8beUx3LUP2p6m6A", + "digest": "5F6G6ykFcRNvSysegDK7kqY71oxrzzP5hNC1ncqgiA7u", "kind": { "__typename": "ProgrammableTransactionBlock" } @@ -87,7 +87,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "JBuShctBdzAwMsiNHQnxTJqUhRuJgrTdUEyCbFc8S86L", + "digest": "9VbftUPfAUfiPvagdpqP7ZSuFiLt2ano5Y2bkNuKQqkf", "kind": { "__typename": "GenesisTransaction" } @@ -105,7 +105,7 @@ Response: { } }, { - "digest": "CgGRbLYTFKi8nSsm4UEsXR2FrJkZA8beUx3LUP2p6m6A", + "digest": "5F6G6ykFcRNvSysegDK7kqY71oxrzzP5hNC1ncqgiA7u", "kind": { "__typename": "ProgrammableTransactionBlock" } @@ -154,7 +154,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "JBuShctBdzAwMsiNHQnxTJqUhRuJgrTdUEyCbFc8S86L", + "digest": "9VbftUPfAUfiPvagdpqP7ZSuFiLt2ano5Y2bkNuKQqkf", "kind": { "__typename": "GenesisTransaction" } @@ -172,7 +172,7 @@ Response: { } }, { - "digest": "CgGRbLYTFKi8nSsm4UEsXR2FrJkZA8beUx3LUP2p6m6A", + "digest": "5F6G6ykFcRNvSysegDK7kqY71oxrzzP5hNC1ncqgiA7u", "kind": { "__typename": "ProgrammableTransactionBlock" } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp index 823e479d2ca..01fd213d079 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp @@ -25,7 +25,7 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0xeb1c83c67776e844cbb6af066709ed47641f75be7bf5a850ab338d5ddf99d31b::m::boom' (instruction 1), abort code: 42" + "errors": "Error in 1st command, from '0xf29c1a00530948c098c2702d5708d2c3b0bcfa5e343744190a405ef9007fa4aa::m::boom' (instruction 1), abort code: 42" } } ] @@ -54,7 +54,7 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 3rd command, from '0xeb1c83c67776e844cbb6af066709ed47641f75be7bf5a850ab338d5ddf99d31b::m::boom' (instruction 1), abort code: 42" + "errors": "Error in 3rd command, from '0xf29c1a00530948c098c2702d5708d2c3b0bcfa5e343744190a405ef9007fa4aa::m::boom' (instruction 1), abort code: 42" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp index 2d6f87efd9c..70ba6bbb774 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp @@ -60,7 +60,7 @@ Response: { }, "nodes": [ { - "digest": "BHnWbs1bAGTHvqmVM8QakhekPkR5xoNa4LSaeFRaU9oU", + "digest": "7j4iXTMhPZ1S8iaainUcepBgkyuAdZM4ieD3cRVzRrS5", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -68,7 +68,7 @@ Response: { } }, { - "digest": "GfT83ydV3hZD4JE7BpRfiqqZ5TFENQDzAVeiEUSVJKdJ", + "digest": "GmLo8rya1MJ9fzQWfuDP4E2PPqz72pDwXi1ufa6cBoRg", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -76,7 +76,7 @@ Response: { } }, { - "digest": "J5WeQemqsD7PiAYUk8o5jbf7m7G4bNqejJ4dUwijQmh5", + "digest": "5LdWdMMWykP5urYkRA5MEBYEGgvyP3DsmVqXgsioZTHf", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -84,7 +84,7 @@ Response: { } }, { - "digest": "89Eq2RtFcvykVH8jYAF91mjF1DBRsLeGU4gfnL96jMoC", + "digest": "5pnQjBtdvcmty6v7fqAazTnqLZSaQpCKgwo54K82mHv2", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -92,7 +92,7 @@ Response: { } }, { - "digest": "9RMtDD1o2929hoHsxJt5RhPXkKAVBREjCpDCiRSGWD4j", + "digest": "4TcNir3bsAn9Dv6z4AFK1M7f4yvNQmxZdW36B1HGnkDX", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -117,7 +117,7 @@ Response: { }, "nodes": [ { - "digest": "BHnWbs1bAGTHvqmVM8QakhekPkR5xoNa4LSaeFRaU9oU", + "digest": "7j4iXTMhPZ1S8iaainUcepBgkyuAdZM4ieD3cRVzRrS5", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -142,7 +142,7 @@ Response: { }, "nodes": [ { - "digest": "GfT83ydV3hZD4JE7BpRfiqqZ5TFENQDzAVeiEUSVJKdJ", + "digest": "GmLo8rya1MJ9fzQWfuDP4E2PPqz72pDwXi1ufa6cBoRg", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -167,7 +167,7 @@ Response: { }, "nodes": [ { - "digest": "J5WeQemqsD7PiAYUk8o5jbf7m7G4bNqejJ4dUwijQmh5", + "digest": "5LdWdMMWykP5urYkRA5MEBYEGgvyP3DsmVqXgsioZTHf", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -192,7 +192,7 @@ Response: { }, "nodes": [ { - "digest": "89Eq2RtFcvykVH8jYAF91mjF1DBRsLeGU4gfnL96jMoC", + "digest": "5pnQjBtdvcmty6v7fqAazTnqLZSaQpCKgwo54K82mHv2", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -217,7 +217,7 @@ Response: { }, "nodes": [ { - "digest": "9RMtDD1o2929hoHsxJt5RhPXkKAVBREjCpDCiRSGWD4j", + "digest": "4TcNir3bsAn9Dv6z4AFK1M7f4yvNQmxZdW36B1HGnkDX", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp index 0241771046d..6ee7572775c 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp @@ -20,12 +20,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "ZUbAobS9qYvY2zJRbjLRktjrF2iYTbB71VeF3G1AH9h", + "digest": "4urZXm6VAYup92skQw49CRt3GrMDktUHpAu9DRNuwxRT", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "APNPMlU6mtK7kyV+DrL5Fp/WskzHMYZipLckBE+bVvCK9Ubp7gjioKxQF3Unpe9X4vZClyXfowHm7O+yUAphpg1/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "ALDyC4/YbN8YtGUXTmRNkHvkXekhngLdf6lcHYmw5cqjKAGtTNhh2tYPCIvZdJLW/67peJ0wH0uowI+R0Uw4ZAd/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -34,7 +34,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" } ] }, @@ -96,7 +96,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "JBuShctBdzAwMsiNHQnxTJqUhRuJgrTdUEyCbFc8S86L" + "digest": "9VbftUPfAUfiPvagdpqP7ZSuFiLt2ano5Y2bkNuKQqkf" } ] }, @@ -116,37 +116,37 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x546651aa715c29ee68ae0bb3d18aada7c2e76d51c82776bf400b13e864415294", - "idCreated": true, + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x546651aa715c29ee68ae0bb3d18aada7c2e76d51c82776bf400b13e864415294", - "digest": "AEVaWDFKA3n7tVyT4wUk2s8kLdk3sYio2JnZseCWVNZb" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "digest": "4ndtri1ULn6Yr9BPPhTKUT16DoreoCA8wr1QUSczQVBx" } }, { - "address": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377", + "address": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377", - "digest": "NYGzm4bKmhujbFFQZu3qQqY9vSypUxfShyZkQEQ86Rr" + "address": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047", + "digest": "BUaNnT7Z9FUGEnM1sGN9su4otLpvb1XT9PtU3Mshy5Ta" } }, { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "idCreated": false, + "address": "0xbe4c22fc20406422a53ed19b0093705aa9e7a1dedc9334daa5f50f156253e4d6", + "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "digest": "4rLL3j957kPuUUA392cdFdUEg1P4UGopS1PpXQPwfSty" + "address": "0xbe4c22fc20406422a53ed19b0093705aa9e7a1dedc9334daa5f50f156253e4d6", + "digest": "JBAdu67ZP9TeGNbSM9bjcG8FVqzL8wPhLgmp9vF6qT61" } } ] }, "gasEffects": { "gasObject": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" }, "gasSummary": { "computationCost": "1000000", @@ -163,7 +163,7 @@ Response: { "sequenceNumber": 1 }, "transactionBlock": { - "digest": "ZUbAobS9qYvY2zJRbjLRktjrF2iYTbB71VeF3G1AH9h" + "digest": "4urZXm6VAYup92skQw49CRt3GrMDktUHpAu9DRNuwxRT" } }, "expiration": null @@ -190,12 +190,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "BecbdoVwCC8UzhxBZTe4W9PYRQ8sTmd24eN8PTkvC6mp", + "digest": "9N4pwiG2feYUYUroruGzseqWhawaqmyet2dxSRhP4i3f", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "AOSbBTMsSnDQBiaV6h0zRPeXAZ9OSBfvS8kdAGOHFOm3i79pjXeBWS1ZKwfpc9/lrHDVRp2EfFlrDZ/hmz5MfAR/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "ALbWVy8DzHWpZiw5Za2MloqU8w/dKOx+mcPUkXJLfCYDUhwyuDTN8pLiZ4UAyBsdgfik6TCqvbeWxD64a3GeTQt/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -204,7 +204,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" } ] }, @@ -219,21 +219,21 @@ Response: { "cursor": "eyJpIjowLCJjIjoyfQ", "node": { "__typename": "OwnedOrImmutable", - "address": "0x546651aa715c29ee68ae0bb3d18aada7c2e76d51c82776bf400b13e864415294", + "address": "0xbe4c22fc20406422a53ed19b0093705aa9e7a1dedc9334daa5f50f156253e4d6", "version": 2, - "digest": "AEVaWDFKA3n7tVyT4wUk2s8kLdk3sYio2JnZseCWVNZb", + "digest": "JBAdu67ZP9TeGNbSM9bjcG8FVqzL8wPhLgmp9vF6qT61", "object": { - "address": "0x546651aa715c29ee68ae0bb3d18aada7c2e76d51c82776bf400b13e864415294", + "address": "0xbe4c22fc20406422a53ed19b0093705aa9e7a1dedc9334daa5f50f156253e4d6", "version": 2, - "digest": "AEVaWDFKA3n7tVyT4wUk2s8kLdk3sYio2JnZseCWVNZb", + "digest": "JBAdu67ZP9TeGNbSM9bjcG8FVqzL8wPhLgmp9vF6qT61", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::package::UpgradeCap" }, "json": { - "id": "0x546651aa715c29ee68ae0bb3d18aada7c2e76d51c82776bf400b13e864415294", - "package": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377", + "id": "0xbe4c22fc20406422a53ed19b0093705aa9e7a1dedc9334daa5f50f156253e4d6", + "package": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047", "version": "1", "policy": 0 } @@ -315,7 +315,7 @@ Response: { "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002" ], - "currentPackage": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377", + "currentPackage": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047", "upgradeTicket": { "__typename": "Result", "cmd": 0, @@ -367,10 +367,10 @@ Response: { "dependencies": { "nodes": [ { - "digest": "ZUbAobS9qYvY2zJRbjLRktjrF2iYTbB71VeF3G1AH9h" + "digest": "4urZXm6VAYup92skQw49CRt3GrMDktUHpAu9DRNuwxRT" }, { - "digest": "JBuShctBdzAwMsiNHQnxTJqUhRuJgrTdUEyCbFc8S86L" + "digest": "9VbftUPfAUfiPvagdpqP7ZSuFiLt2ano5Y2bkNuKQqkf" } ] }, @@ -390,37 +390,37 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x169bb0aedf2afe70f81aab6fa4ca35821ecfdf49aa4387e541f593922152294a", - "idCreated": true, + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x169bb0aedf2afe70f81aab6fa4ca35821ecfdf49aa4387e541f593922152294a", - "digest": "6H4hmau8qvGqfnfMXhdfcwgBWFKh8gZG1C6ViR1GpXW6" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "digest": "ABUKuSvCVJyiyyKhLqQHzZuVv34kc1cjyosQ4iR9y1Vk" } }, { - "address": "0x546651aa715c29ee68ae0bb3d18aada7c2e76d51c82776bf400b13e864415294", - "idCreated": false, + "address": "0x63ad961afd7127cf0cbe7b1c870f960b2befb275915035a3d590aa1e16444392", + "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x546651aa715c29ee68ae0bb3d18aada7c2e76d51c82776bf400b13e864415294", - "digest": "2r8yRaT1XWQYzzEdfmBoLcsBG4p75SkKn9drYvcnsNsU" + "address": "0x63ad961afd7127cf0cbe7b1c870f960b2befb275915035a3d590aa1e16444392", + "digest": "9Vr85egqPxDMbb9qrsPXoxMPboXYPxiHe96jLW4ZNtvF" } }, { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", + "address": "0xbe4c22fc20406422a53ed19b0093705aa9e7a1dedc9334daa5f50f156253e4d6", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "digest": "EyDiCnSu3gSi8XRcFEwzG4qdjPzLG33asQ4P81TraEfq" + "address": "0xbe4c22fc20406422a53ed19b0093705aa9e7a1dedc9334daa5f50f156253e4d6", + "digest": "8s6VdXfUZBmieVVcEvpPeqiMSMjySAGvBsRDwDRYtuL4" } } ] }, "gasEffects": { "gasObject": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" }, "gasSummary": { "computationCost": "1000000", @@ -437,7 +437,7 @@ Response: { "sequenceNumber": 2 }, "transactionBlock": { - "digest": "BecbdoVwCC8UzhxBZTe4W9PYRQ8sTmd24eN8PTkvC6mp" + "digest": "9N4pwiG2feYUYUroruGzseqWhawaqmyet2dxSRhP4i3f" } }, "expiration": null @@ -482,12 +482,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "GWe4UJgcoRJZDmjc2ayBhfwM8Yy7KvWXUHJ4wK5oPe9F", + "digest": "5iSVc972oBXFL3xrmSm7TH7o5Vg9p9GZsPZ1tpjzpJpN", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "AMeXJ/X9zAOnWVa5Go9e4sfrB2Ays1ZOwMbWYjBmpx5VePg5a5rGBal1Umeps8GS+Yzqvf6kFH/M1uRBIC64FwN/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "APfzdxPmxhD/fNrYYKbItxeu1xY/yvyc4UXjQQJXSfoc493okH9s6nSQ/poOwscoXzFg5XJwC5R+v9m+yVnUGwV/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -496,7 +496,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" } ] }, @@ -591,7 +591,7 @@ Response: { "cursor": "eyJpIjozLCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x169bb0aedf2afe70f81aab6fa4ca35821ecfdf49aa4387e541f593922152294a", + "package": "0x63ad961afd7127cf0cbe7b1c870f960b2befb275915035a3d590aa1e16444392", "module": "m", "functionName": "new", "typeArguments": [], @@ -615,7 +615,7 @@ Response: { ], "return": [ { - "repr": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377::m::Foo" + "repr": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047::m::Foo" } ] } @@ -642,7 +642,7 @@ Response: { "cursor": "eyJpIjo1LCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x169bb0aedf2afe70f81aab6fa4ca35821ecfdf49aa4387e541f593922152294a", + "package": "0x63ad961afd7127cf0cbe7b1c870f960b2befb275915035a3d590aa1e16444392", "module": "m", "functionName": "new", "typeArguments": [], @@ -666,7 +666,7 @@ Response: { ], "return": [ { - "repr": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377::m::Foo" + "repr": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047::m::Foo" } ] } @@ -676,7 +676,7 @@ Response: { "cursor": "eyJpIjo2LCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x169bb0aedf2afe70f81aab6fa4ca35821ecfdf49aa4387e541f593922152294a", + "package": "0x63ad961afd7127cf0cbe7b1c870f960b2befb275915035a3d590aa1e16444392", "module": "m", "functionName": "burn", "typeArguments": [], @@ -692,7 +692,7 @@ Response: { "typeParameters": [], "parameters": [ { - "repr": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377::m::Foo" + "repr": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047::m::Foo" } ], "return": [] @@ -744,10 +744,10 @@ Response: { "dependencies": { "nodes": [ { - "digest": "9SGG8wjvABKmhGZGN8ZS8UzzqP3LHnTikE14z5P91e3B" + "digest": "9N4pwiG2feYUYUroruGzseqWhawaqmyet2dxSRhP4i3f" }, { - "digest": "BecbdoVwCC8UzhxBZTe4W9PYRQ8sTmd24eN8PTkvC6mp" + "digest": "HoNMV5E2V3tBr7FpMmkxrk6CHRjwdrMFyhYcvzXs8r3J" } ] }, @@ -767,19 +767,19 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "digest": "6ZNLDZAUBWeWxUBnLg65KWXnYHxutPpbBakZe8k2tPsE", + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "digest": "6XN3GYFLJ75b9HN3YmxxAkgh5583JxMpRqimaJ87pxce", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", + "id": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", "balance": { "value": "299999982082400" } @@ -789,19 +789,19 @@ Response: { } }, { - "address": "0x836d268782552c67bfba754975f2a4c65eba95bfb20e90109f2cd0042b86e138", + "address": "0x6b2166af556a7b3b6927baefd7bdcbf25a7b1e43ddbe030274a26646467b2045", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x836d268782552c67bfba754975f2a4c65eba95bfb20e90109f2cd0042b86e138", - "digest": "8z6Et5PK2UemWbFaA7DyRrHjQcymBmzYHYRf3AbvNqWL", + "address": "0x6b2166af556a7b3b6927baefd7bdcbf25a7b1e43ddbe030274a26646467b2045", + "digest": "2PM1PJyKgFx7gYAcHJLyWAEHCiQfJNW7VLZfEXM1ocsv", "asMoveObject": { "contents": { "type": { - "repr": "0x728c8a7066d6ddefc37cc27f5fa9d8da87d3fbb14ea89b7e086ad243f90c1377::m::Foo" + "repr": "0x81bff93a0788fede53d025bd251d287f84837bce9b895fb915f08826ec9e9047::m::Foo" }, "json": { - "id": "0x836d268782552c67bfba754975f2a4c65eba95bfb20e90109f2cd0042b86e138", + "id": "0x6b2166af556a7b3b6927baefd7bdcbf25a7b1e43ddbe030274a26646467b2045", "xs": [ "42", "43" @@ -812,19 +812,19 @@ Response: { } }, { - "address": "0xae540e061a6faeaebf8a526b06721ef2c062d648d62dfd1af51f2b0865ead81f", + "address": "0xba1455835475dfa2390735652d7dbaae9f908e87c3065a04d8656c3dbf7ae10f", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xae540e061a6faeaebf8a526b06721ef2c062d648d62dfd1af51f2b0865ead81f", - "digest": "27hwyX9cgvmSEEU4Zin8g6Mykm24M22cKPzmQKVsKNc1", + "address": "0xba1455835475dfa2390735652d7dbaae9f908e87c3065a04d8656c3dbf7ae10f", + "digest": "6HqXi38eEMUwEH9L8xmuW1ih8bJvt62maHVCtC9B8Dne", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xae540e061a6faeaebf8a526b06721ef2c062d648d62dfd1af51f2b0865ead81f", + "id": "0xba1455835475dfa2390735652d7dbaae9f908e87c3065a04d8656c3dbf7ae10f", "balance": { "value": "2000" } @@ -837,7 +837,7 @@ Response: { }, "gasEffects": { "gasObject": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" }, "gasSummary": { "computationCost": "1000000", @@ -854,7 +854,7 @@ Response: { "sequenceNumber": 3 }, "transactionBlock": { - "digest": "GWe4UJgcoRJZDmjc2ayBhfwM8Yy7KvWXUHJ4wK5oPe9F" + "digest": "5iSVc972oBXFL3xrmSm7TH7o5Vg9p9GZsPZ1tpjzpJpN" } }, "expiration": null @@ -881,12 +881,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "AkfM4f9bFkhH3oHtk1SxQoJg6hd4YEUipZ5nEHGUuyhE", + "digest": "DwY2iFZRJS9qP1zVWfS6SrcXLRTZo3DLRjduFLB5VRF5", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "AHhUjshtxmJOoXShHpdM4zp2PIV/veE97JWH2BhKRa/njO9/CFKGf31/VXHKilUTj7zuRfC4/hPhNd0meG+KDwp/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "AAxP2v2ujvkHQVQZW7DfknZCiFxsUeIKGfhgMsarcPmokZjUIZbVcF8Q1qFRoKcdf6VWaEYWwTqbIzZ2ltG9KAx/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -895,7 +895,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" } ] }, @@ -942,7 +942,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "GWe4UJgcoRJZDmjc2ayBhfwM8Yy7KvWXUHJ4wK5oPe9F" + "digest": "5iSVc972oBXFL3xrmSm7TH7o5Vg9p9GZsPZ1tpjzpJpN" } ] }, @@ -962,19 +962,19 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c", - "digest": "7TpRhyt5go4geHBvPgiMPNWrFVfi1j6sAfTW5YrLszDu" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", + "digest": "91pXugV1gb6x53vnqMGHYmPK8AqDCTbVboxpj25ggaj5" } } ] }, "gasEffects": { "gasObject": { - "address": "0x7ab276e07bc81d3c00ac3f5234cce7214b5e69f5cbfa07535f14b05eeca5597c" + "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4" }, "gasSummary": { "computationCost": "1000000", @@ -991,7 +991,7 @@ Response: { "sequenceNumber": 4 }, "transactionBlock": { - "digest": "AkfM4f9bFkhH3oHtk1SxQoJg6hd4YEUipZ5nEHGUuyhE" + "digest": "DwY2iFZRJS9qP1zVWfS6SrcXLRTZo3DLRjduFLB5VRF5" } }, "expiration": null diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp index 932362d55f8..ad8c9878cf5 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp @@ -19,7 +19,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000008", "inner": { - "id": "0x64245391f93d86304a99e09b136505481f2374b4bf9e6aeeae25976310517f76", + "id": "0xbb7c7a925282d7c3baca21ceaa0b0db0cc4722ed2ea19ae76414fd8d45434090", "version": "1" } } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp index 9776e283cec..391136e5242 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -124,7 +124,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "8JVhaHpmcF8nXEiddc27dbsY2kUQYcNTm6Hnh27LWDmM", + "digest": "DYNZjG6A9EEkWFaMRnjiPeNfWsKToMS1mbgMmiMZDLNH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -135,7 +135,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DhuoWAfbY5rhBBmNA8BF2UPgCkZ4hL4kzFSHy568ZCxQ", + "digest": "CssvzY5HFFBfx2KhJ5EuG23eWTsxaP24ULjecKP1tdSs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -163,7 +163,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "8JVhaHpmcF8nXEiddc27dbsY2kUQYcNTm6Hnh27LWDmM", + "digest": "DYNZjG6A9EEkWFaMRnjiPeNfWsKToMS1mbgMmiMZDLNH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -191,7 +191,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "6ZBJU5xxGpDGCV6ppjMaobNEjXn4vWFZ2M2uxA4SeUbg", + "digest": "GxjkqJdtapQMT9Mmi8pU3iAXz6U8SqbZpui2qrWiRdNG", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -219,7 +219,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DhuoWAfbY5rhBBmNA8BF2UPgCkZ4hL4kzFSHy568ZCxQ", + "digest": "CssvzY5HFFBfx2KhJ5EuG23eWTsxaP24ULjecKP1tdSs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -230,7 +230,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "6ZBJU5xxGpDGCV6ppjMaobNEjXn4vWFZ2M2uxA4SeUbg", + "digest": "GxjkqJdtapQMT9Mmi8pU3iAXz6U8SqbZpui2qrWiRdNG", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -258,7 +258,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "4qbyWF6ThFK1cvfjzoTBvPn1CjbHr89KamgvMABSsVfY", + "digest": "AejvCb7QcW4LT9jnZChmMgGUF7Wb3vTuWujE5PU8WJVX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -286,7 +286,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "4qbyWF6ThFK1cvfjzoTBvPn1CjbHr89KamgvMABSsVfY", + "digest": "AejvCb7QcW4LT9jnZChmMgGUF7Wb3vTuWujE5PU8WJVX", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp index 7cd694e7d50..bffecfaabed 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "3gWiKogJTZXwNofPHC8o6VSFAqZ94YDqw2nJkWxKj9UW", + "digest": "EdbJe9dVY6j3SahCNPhh1cSCuoZcrL1kaU9dH8SygbKn", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -124,7 +124,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "3gWiKogJTZXwNofPHC8o6VSFAqZ94YDqw2nJkWxKj9UW", + "digest": "EdbJe9dVY6j3SahCNPhh1cSCuoZcrL1kaU9dH8SygbKn", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -135,7 +135,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "b4pDNoqxfBPsQ7WnHcLG5sZ81CrxVtUgWiUJ8DPggxk", + "digest": "35dhDUJEKrYDdJfiWhQbUyAPcnynCwXckQi1dkqdACT6", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -163,7 +163,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "4moXjSKeRMSz1d3X9mf5WVoufqXpy9yNsy7UtVczW5t7", + "digest": "9cnCCeWn9fAAJQNgbpnCaFnmABaNKtk3xVLxXW64Emkt", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp index 3472aea5585..369fbc14e3f 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "3gWiKogJTZXwNofPHC8o6VSFAqZ94YDqw2nJkWxKj9UW", + "digest": "EdbJe9dVY6j3SahCNPhh1cSCuoZcrL1kaU9dH8SygbKn", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "b4pDNoqxfBPsQ7WnHcLG5sZ81CrxVtUgWiUJ8DPggxk", + "digest": "35dhDUJEKrYDdJfiWhQbUyAPcnynCwXckQi1dkqdACT6", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "638XQvJJ3thhxEWXSguc1CgYogWZ4qbJqRv8GoX93q3J", + "digest": "3hcWVZ3oviEDHcJFopsUMUe91yM4ZyzPV7Yp3NmSpNYS", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "ECJfcn3hTE2pb5PruJsfjZNHiRezpFTPRxBS9XMy6HwH", + "digest": "8RcBTUjaJg8RhhMTc8LNEGXtmWrDCBDx1wFEHkc8bPcn", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -168,7 +168,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -196,7 +196,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "3gWiKogJTZXwNofPHC8o6VSFAqZ94YDqw2nJkWxKj9UW", + "digest": "EdbJe9dVY6j3SahCNPhh1cSCuoZcrL1kaU9dH8SygbKn", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -224,7 +224,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "b4pDNoqxfBPsQ7WnHcLG5sZ81CrxVtUgWiUJ8DPggxk", + "digest": "35dhDUJEKrYDdJfiWhQbUyAPcnynCwXckQi1dkqdACT6", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -268,7 +268,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "638XQvJJ3thhxEWXSguc1CgYogWZ4qbJqRv8GoX93q3J", + "digest": "3hcWVZ3oviEDHcJFopsUMUe91yM4ZyzPV7Yp3NmSpNYS", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "ECJfcn3hTE2pb5PruJsfjZNHiRezpFTPRxBS9XMy6HwH", + "digest": "8RcBTUjaJg8RhhMTc8LNEGXtmWrDCBDx1wFEHkc8bPcn", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -333,7 +333,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "638XQvJJ3thhxEWXSguc1CgYogWZ4qbJqRv8GoX93q3J", + "digest": "3hcWVZ3oviEDHcJFopsUMUe91yM4ZyzPV7Yp3NmSpNYS", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -344,7 +344,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "ECJfcn3hTE2pb5PruJsfjZNHiRezpFTPRxBS9XMy6HwH", + "digest": "8RcBTUjaJg8RhhMTc8LNEGXtmWrDCBDx1wFEHkc8bPcn", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp index 6d78c4b0f1b..02b24ecbe10 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "5mukuWJ2kPAe8Pg2NcMf9vZPk4ioUH9Tv4NMBXcK7Mw7", + "digest": "GQjPtbLoTuzBBxwnEyDLSdQi9FDb5iFQQRm9HGAjCUAh", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "8YjT1HZeAY2qEE5mYbZMS4aGzyt1YDXoHhgScA9NUgBR", + "digest": "D5fJkSQJPrcwnCmTSJXiV6HQB6C4CedJLAjVML4dzQ9n", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "B3tP4VxNzXd1Y4WP5dwsRbnRtcRTfQSenZ15EbfEQH3p", + "digest": "6gww8sibozKni541AFGQfyojcYpnT3BXPHL59PA8o15Y", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "2ywy8D7ccV9TXjq5fK3YSW988JduU6cno22z2veFDwAa", + "digest": "9TaQGLjD6shzSyc5ydvnp5yFLeKC1cwphyuU1M2fQcAW", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -168,7 +168,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "2ywy8D7ccV9TXjq5fK3YSW988JduU6cno22z2veFDwAa", + "digest": "9TaQGLjD6shzSyc5ydvnp5yFLeKC1cwphyuU1M2fQcAW", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -196,7 +196,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "B3tP4VxNzXd1Y4WP5dwsRbnRtcRTfQSenZ15EbfEQH3p", + "digest": "6gww8sibozKni541AFGQfyojcYpnT3BXPHL59PA8o15Y", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -224,7 +224,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "8YjT1HZeAY2qEE5mYbZMS4aGzyt1YDXoHhgScA9NUgBR", + "digest": "D5fJkSQJPrcwnCmTSJXiV6HQB6C4CedJLAjVML4dzQ9n", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -268,7 +268,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "5mukuWJ2kPAe8Pg2NcMf9vZPk4ioUH9Tv4NMBXcK7Mw7", + "digest": "GQjPtbLoTuzBBxwnEyDLSdQi9FDb5iFQQRm9HGAjCUAh", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp index bcc56c614e1..2a642d60f73 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp @@ -164,7 +164,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -175,7 +175,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "HXhwQy2Cd8biC8fe111TFSYLKYYZoi5cWAFb7n4Epfdr", + "digest": "2LrKRC5ZgB1DnD2fQ3mi9Vu1Qop7kTC1CoWzVw8xz3hA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -186,7 +186,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "4w9544BVTSDYvvDibJmDsTJanU8zK8SpVMDzEzCMyv5W", + "digest": "E8tTq6ae8rGxeSVJzaefLiA7b4ZQUGNjGLmhUenZRwiQ", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -197,7 +197,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxOCwiaSI6ZmFsc2V9", "node": { - "digest": "HatuDy6reNH1mTyo6fAwmJ84Syx53poEjZyYh22fMmcJ", + "digest": "5Ma75hDHhWi5G7MQMn4AgXv43qEwT73zLZseQjGZ86qN", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -208,7 +208,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "E93RP9r3oqbpfxyrBi93MgHAvF4tWZhk4XHrvBcgevyZ", + "digest": "8qzWm79isfnZR4g7dEFprLMAX2K2AVnKdsCm8tgqbnWS", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -236,7 +236,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -264,7 +264,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "HXhwQy2Cd8biC8fe111TFSYLKYYZoi5cWAFb7n4Epfdr", + "digest": "2LrKRC5ZgB1DnD2fQ3mi9Vu1Qop7kTC1CoWzVw8xz3hA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -308,7 +308,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "4w9544BVTSDYvvDibJmDsTJanU8zK8SpVMDzEzCMyv5W", + "digest": "E8tTq6ae8rGxeSVJzaefLiA7b4ZQUGNjGLmhUenZRwiQ", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -336,7 +336,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxOCwiaSI6ZmFsc2V9", "node": { - "digest": "HatuDy6reNH1mTyo6fAwmJ84Syx53poEjZyYh22fMmcJ", + "digest": "5Ma75hDHhWi5G7MQMn4AgXv43qEwT73zLZseQjGZ86qN", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -364,7 +364,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "E93RP9r3oqbpfxyrBi93MgHAvF4tWZhk4XHrvBcgevyZ", + "digest": "8qzWm79isfnZR4g7dEFprLMAX2K2AVnKdsCm8tgqbnWS", "effects": { "checkpoint": { "sequenceNumber": 5 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp index e5244a5f968..270149be6c7 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp @@ -164,7 +164,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -175,7 +175,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "HXhwQy2Cd8biC8fe111TFSYLKYYZoi5cWAFb7n4Epfdr", + "digest": "2LrKRC5ZgB1DnD2fQ3mi9Vu1Qop7kTC1CoWzVw8xz3hA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -186,7 +186,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "4w9544BVTSDYvvDibJmDsTJanU8zK8SpVMDzEzCMyv5W", + "digest": "E8tTq6ae8rGxeSVJzaefLiA7b4ZQUGNjGLmhUenZRwiQ", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -197,7 +197,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "9zEYeCv3r6s91Kg4YuD9PdNNNagSbQcCWHVFVa7xddMx", + "digest": "JDfGkUkkF7D1MabHP6MVJYorXZzyuJS4spXKXwYPeCE5", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -225,7 +225,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "9zEYeCv3r6s91Kg4YuD9PdNNNagSbQcCWHVFVa7xddMx", + "digest": "JDfGkUkkF7D1MabHP6MVJYorXZzyuJS4spXKXwYPeCE5", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -253,7 +253,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "4w9544BVTSDYvvDibJmDsTJanU8zK8SpVMDzEzCMyv5W", + "digest": "E8tTq6ae8rGxeSVJzaefLiA7b4ZQUGNjGLmhUenZRwiQ", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -313,7 +313,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "HXhwQy2Cd8biC8fe111TFSYLKYYZoi5cWAFb7n4Epfdr", + "digest": "2LrKRC5ZgB1DnD2fQ3mi9Vu1Qop7kTC1CoWzVw8xz3hA", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -341,7 +341,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp index b2b204cf6e5..1f0c1e30635 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "7WkPvP5a39xpy98ZNga8NrTAJLdShhovwvvmCxiZFaz2", + "digest": "3UnCkhhojkEawugjNe2NEEoTFSBPpcX1MCrmgjbWqEiH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "8JVhaHpmcF8nXEiddc27dbsY2kUQYcNTm6Hnh27LWDmM", + "digest": "DYNZjG6A9EEkWFaMRnjiPeNfWsKToMS1mbgMmiMZDLNH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "9ReXMV51j2TMW2Hj9mc3mk2V4NuYqRUjrG3H7osPGWgN", + "digest": "FbMKf7ziCqpHLdsJvjEzY3xdvmLkdWjoUwDuSAbFMTK7", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DhuoWAfbY5rhBBmNA8BF2UPgCkZ4hL4kzFSHy568ZCxQ", + "digest": "CssvzY5HFFBfx2KhJ5EuG23eWTsxaP24ULjecKP1tdSs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "FEHxAg62jzcSDiMqqw5dX821XsMhcTDUhyXGcqVo9uY6", + "digest": "4KJCNArN7R4h9vZmMyLR9adwrHVgddYoFw27Agf2JoaV", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -162,7 +162,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "6ZBJU5xxGpDGCV6ppjMaobNEjXn4vWFZ2M2uxA4SeUbg", + "digest": "GxjkqJdtapQMT9Mmi8pU3iAXz6U8SqbZpui2qrWiRdNG", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -173,7 +173,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "FTASFTZ9Rcr52HKv5V5v8n1dN5cYMBRQc9Qyo716WpiN", + "digest": "HSfV9V4Rb71F4Eo1RcDPEQXommfnXm4NpZUZe8QedRnW", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -184,7 +184,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "4qbyWF6ThFK1cvfjzoTBvPn1CjbHr89KamgvMABSsVfY", + "digest": "AejvCb7QcW4LT9jnZChmMgGUF7Wb3vTuWujE5PU8WJVX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -195,7 +195,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "5kuiVU9xejCQ2Ziw2srV3UA2Lon3o1mF5UJVkHoL36eH", + "digest": "HVLpxjJeDVnQ4r7McrWVd3taDLYBgXcEW37veWBKrCfv", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -223,7 +223,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -251,7 +251,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "8JVhaHpmcF8nXEiddc27dbsY2kUQYcNTm6Hnh27LWDmM", + "digest": "DYNZjG6A9EEkWFaMRnjiPeNfWsKToMS1mbgMmiMZDLNH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DhuoWAfbY5rhBBmNA8BF2UPgCkZ4hL4kzFSHy568ZCxQ", + "digest": "CssvzY5HFFBfx2KhJ5EuG23eWTsxaP24ULjecKP1tdSs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -290,7 +290,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "6ZBJU5xxGpDGCV6ppjMaobNEjXn4vWFZ2M2uxA4SeUbg", + "digest": "GxjkqJdtapQMT9Mmi8pU3iAXz6U8SqbZpui2qrWiRdNG", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -318,7 +318,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "4qbyWF6ThFK1cvfjzoTBvPn1CjbHr89KamgvMABSsVfY", + "digest": "AejvCb7QcW4LT9jnZChmMgGUF7Wb3vTuWujE5PU8WJVX", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp index ffa5ee71059..163cdd74044 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "7WkPvP5a39xpy98ZNga8NrTAJLdShhovwvvmCxiZFaz2", + "digest": "3UnCkhhojkEawugjNe2NEEoTFSBPpcX1MCrmgjbWqEiH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "8JVhaHpmcF8nXEiddc27dbsY2kUQYcNTm6Hnh27LWDmM", + "digest": "DYNZjG6A9EEkWFaMRnjiPeNfWsKToMS1mbgMmiMZDLNH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "9ReXMV51j2TMW2Hj9mc3mk2V4NuYqRUjrG3H7osPGWgN", + "digest": "FbMKf7ziCqpHLdsJvjEzY3xdvmLkdWjoUwDuSAbFMTK7", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DhuoWAfbY5rhBBmNA8BF2UPgCkZ4hL4kzFSHy568ZCxQ", + "digest": "CssvzY5HFFBfx2KhJ5EuG23eWTsxaP24ULjecKP1tdSs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "FEHxAg62jzcSDiMqqw5dX821XsMhcTDUhyXGcqVo9uY6", + "digest": "4KJCNArN7R4h9vZmMyLR9adwrHVgddYoFw27Agf2JoaV", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -162,7 +162,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "6ZBJU5xxGpDGCV6ppjMaobNEjXn4vWFZ2M2uxA4SeUbg", + "digest": "GxjkqJdtapQMT9Mmi8pU3iAXz6U8SqbZpui2qrWiRdNG", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -173,7 +173,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "FTASFTZ9Rcr52HKv5V5v8n1dN5cYMBRQc9Qyo716WpiN", + "digest": "HSfV9V4Rb71F4Eo1RcDPEQXommfnXm4NpZUZe8QedRnW", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -184,7 +184,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "4qbyWF6ThFK1cvfjzoTBvPn1CjbHr89KamgvMABSsVfY", + "digest": "AejvCb7QcW4LT9jnZChmMgGUF7Wb3vTuWujE5PU8WJVX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -195,7 +195,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "5kuiVU9xejCQ2Ziw2srV3UA2Lon3o1mF5UJVkHoL36eH", + "digest": "HVLpxjJeDVnQ4r7McrWVd3taDLYBgXcEW37veWBKrCfv", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -223,7 +223,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "4qbyWF6ThFK1cvfjzoTBvPn1CjbHr89KamgvMABSsVfY", + "digest": "AejvCb7QcW4LT9jnZChmMgGUF7Wb3vTuWujE5PU8WJVX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -251,7 +251,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "6ZBJU5xxGpDGCV6ppjMaobNEjXn4vWFZ2M2uxA4SeUbg", + "digest": "GxjkqJdtapQMT9Mmi8pU3iAXz6U8SqbZpui2qrWiRdNG", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DhuoWAfbY5rhBBmNA8BF2UPgCkZ4hL4kzFSHy568ZCxQ", + "digest": "CssvzY5HFFBfx2KhJ5EuG23eWTsxaP24ULjecKP1tdSs", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -307,7 +307,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "8JVhaHpmcF8nXEiddc27dbsY2kUQYcNTm6Hnh27LWDmM", + "digest": "DYNZjG6A9EEkWFaMRnjiPeNfWsKToMS1mbgMmiMZDLNH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -335,7 +335,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "mwCyozmxsNvmGdRkPQFGnz1FWbSsbi1Y5nAwwoCEvYj", + "digest": "4LdRFksGsi9QbFWjnDWZ7BMjck6D6h2Fq74qp13siA56", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp index 304a5a18043..f132f9b222d 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp @@ -94,7 +94,7 @@ Response: { }, "nodes": [ { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -102,7 +102,7 @@ Response: { } }, { - "digest": "5mukuWJ2kPAe8Pg2NcMf9vZPk4ioUH9Tv4NMBXcK7Mw7", + "digest": "GQjPtbLoTuzBBxwnEyDLSdQi9FDb5iFQQRm9HGAjCUAh", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -110,7 +110,7 @@ Response: { } }, { - "digest": "H1hNjz6fLwZM2gtcnDBbJDFCdMGt1dXNBMj6SYtkVbrZ", + "digest": "MjmmXLZnaxtW3qWsiC4RAQG6qSaYLujy6E4H6Pm44ek", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { } }, { - "digest": "77y9Ar7drhCp1fG4AbEEcND8b3UC1AinA719tCKeAUaQ", + "digest": "GDVx8gSqX38zGXJMMUGr7Wz5twzD8A9ggfpWR5TNYYh6", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -126,7 +126,7 @@ Response: { } }, { - "digest": "3K2kUPMCVQX82QSL7TVXVoyJVo3TJVqgk5k6gB96oLbF", + "digest": "GrwskUANoDHZCQ2baD4JtmKLtdniyFTrzLcA8FYXrU22", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -134,7 +134,7 @@ Response: { } }, { - "digest": "AoaNoKrkQAW7R8epyboHAhrNmiJed7WqxUYHX2p9W3Gi", + "digest": "3FrntvUU8Ux144JNCT61VZ5qk9qLnR9gvShoCgcxFv8P", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -142,7 +142,7 @@ Response: { } }, { - "digest": "2LnbVjwp4WsEPTCttuU3Ae3ZaMYDbU9hAjAtYZHABfNU", + "digest": "87smnyKWh3RpPYV2aXCidayLJ9jGFyoEzCzESfHMFsCq", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -150,7 +150,7 @@ Response: { } }, { - "digest": "5Kh9fi4ppVyknuXtAPKszkh4iGGjLgoKLjUosLsJYrNM", + "digest": "CeEdmUCo7tyCDUKh7YQ8rdz3azzgkPaTV4NcxRPXmSSX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -158,7 +158,7 @@ Response: { } }, { - "digest": "5hB8rPyv4pApk9abZStGxoJQ72ecDB4JmnR2Cd5CAQ5T", + "digest": "GsF7LSJASi27iAKzwz9JqAQJvCnQaNqNLWEwwDmBd7qt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -166,7 +166,7 @@ Response: { } }, { - "digest": "3pNVMUJVJwDwUzebUReA3pXEHtyWLhGR1UeuGdZFPoNP", + "digest": "6CEEJu89tWrqRsnjEcCnerqNnkuMYNcyyz4eXR9eZo29", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -191,7 +191,7 @@ Response: { }, "nodes": [ { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -199,7 +199,7 @@ Response: { } }, { - "digest": "5mukuWJ2kPAe8Pg2NcMf9vZPk4ioUH9Tv4NMBXcK7Mw7", + "digest": "GQjPtbLoTuzBBxwnEyDLSdQi9FDb5iFQQRm9HGAjCUAh", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -207,7 +207,7 @@ Response: { } }, { - "digest": "H1hNjz6fLwZM2gtcnDBbJDFCdMGt1dXNBMj6SYtkVbrZ", + "digest": "MjmmXLZnaxtW3qWsiC4RAQG6qSaYLujy6E4H6Pm44ek", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -215,7 +215,7 @@ Response: { } }, { - "digest": "77y9Ar7drhCp1fG4AbEEcND8b3UC1AinA719tCKeAUaQ", + "digest": "GDVx8gSqX38zGXJMMUGr7Wz5twzD8A9ggfpWR5TNYYh6", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -223,7 +223,7 @@ Response: { } }, { - "digest": "3K2kUPMCVQX82QSL7TVXVoyJVo3TJVqgk5k6gB96oLbF", + "digest": "GrwskUANoDHZCQ2baD4JtmKLtdniyFTrzLcA8FYXrU22", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -231,7 +231,7 @@ Response: { } }, { - "digest": "AoaNoKrkQAW7R8epyboHAhrNmiJed7WqxUYHX2p9W3Gi", + "digest": "3FrntvUU8Ux144JNCT61VZ5qk9qLnR9gvShoCgcxFv8P", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -239,7 +239,7 @@ Response: { } }, { - "digest": "2LnbVjwp4WsEPTCttuU3Ae3ZaMYDbU9hAjAtYZHABfNU", + "digest": "87smnyKWh3RpPYV2aXCidayLJ9jGFyoEzCzESfHMFsCq", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -247,7 +247,7 @@ Response: { } }, { - "digest": "5Kh9fi4ppVyknuXtAPKszkh4iGGjLgoKLjUosLsJYrNM", + "digest": "CeEdmUCo7tyCDUKh7YQ8rdz3azzgkPaTV4NcxRPXmSSX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -255,7 +255,7 @@ Response: { } }, { - "digest": "5hB8rPyv4pApk9abZStGxoJQ72ecDB4JmnR2Cd5CAQ5T", + "digest": "GsF7LSJASi27iAKzwz9JqAQJvCnQaNqNLWEwwDmBd7qt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -263,7 +263,7 @@ Response: { } }, { - "digest": "3pNVMUJVJwDwUzebUReA3pXEHtyWLhGR1UeuGdZFPoNP", + "digest": "6CEEJu89tWrqRsnjEcCnerqNnkuMYNcyyz4eXR9eZo29", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -311,7 +311,7 @@ Response: { }, "nodes": [ { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -319,7 +319,7 @@ Response: { } }, { - "digest": "5mukuWJ2kPAe8Pg2NcMf9vZPk4ioUH9Tv4NMBXcK7Mw7", + "digest": "GQjPtbLoTuzBBxwnEyDLSdQi9FDb5iFQQRm9HGAjCUAh", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -327,7 +327,7 @@ Response: { } }, { - "digest": "H1hNjz6fLwZM2gtcnDBbJDFCdMGt1dXNBMj6SYtkVbrZ", + "digest": "MjmmXLZnaxtW3qWsiC4RAQG6qSaYLujy6E4H6Pm44ek", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -335,7 +335,7 @@ Response: { } }, { - "digest": "77y9Ar7drhCp1fG4AbEEcND8b3UC1AinA719tCKeAUaQ", + "digest": "GDVx8gSqX38zGXJMMUGr7Wz5twzD8A9ggfpWR5TNYYh6", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -343,7 +343,7 @@ Response: { } }, { - "digest": "3K2kUPMCVQX82QSL7TVXVoyJVo3TJVqgk5k6gB96oLbF", + "digest": "GrwskUANoDHZCQ2baD4JtmKLtdniyFTrzLcA8FYXrU22", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -351,7 +351,7 @@ Response: { } }, { - "digest": "AoaNoKrkQAW7R8epyboHAhrNmiJed7WqxUYHX2p9W3Gi", + "digest": "3FrntvUU8Ux144JNCT61VZ5qk9qLnR9gvShoCgcxFv8P", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -359,7 +359,7 @@ Response: { } }, { - "digest": "2LnbVjwp4WsEPTCttuU3Ae3ZaMYDbU9hAjAtYZHABfNU", + "digest": "87smnyKWh3RpPYV2aXCidayLJ9jGFyoEzCzESfHMFsCq", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -367,7 +367,7 @@ Response: { } }, { - "digest": "5Kh9fi4ppVyknuXtAPKszkh4iGGjLgoKLjUosLsJYrNM", + "digest": "CeEdmUCo7tyCDUKh7YQ8rdz3azzgkPaTV4NcxRPXmSSX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -375,7 +375,7 @@ Response: { } }, { - "digest": "5hB8rPyv4pApk9abZStGxoJQ72ecDB4JmnR2Cd5CAQ5T", + "digest": "GsF7LSJASi27iAKzwz9JqAQJvCnQaNqNLWEwwDmBd7qt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -383,7 +383,7 @@ Response: { } }, { - "digest": "3pNVMUJVJwDwUzebUReA3pXEHtyWLhGR1UeuGdZFPoNP", + "digest": "6CEEJu89tWrqRsnjEcCnerqNnkuMYNcyyz4eXR9eZo29", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -431,7 +431,7 @@ Response: { }, "nodes": [ { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -439,7 +439,7 @@ Response: { } }, { - "digest": "5mukuWJ2kPAe8Pg2NcMf9vZPk4ioUH9Tv4NMBXcK7Mw7", + "digest": "GQjPtbLoTuzBBxwnEyDLSdQi9FDb5iFQQRm9HGAjCUAh", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -447,7 +447,7 @@ Response: { } }, { - "digest": "H1hNjz6fLwZM2gtcnDBbJDFCdMGt1dXNBMj6SYtkVbrZ", + "digest": "MjmmXLZnaxtW3qWsiC4RAQG6qSaYLujy6E4H6Pm44ek", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -455,7 +455,7 @@ Response: { } }, { - "digest": "77y9Ar7drhCp1fG4AbEEcND8b3UC1AinA719tCKeAUaQ", + "digest": "GDVx8gSqX38zGXJMMUGr7Wz5twzD8A9ggfpWR5TNYYh6", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -463,7 +463,7 @@ Response: { } }, { - "digest": "3K2kUPMCVQX82QSL7TVXVoyJVo3TJVqgk5k6gB96oLbF", + "digest": "GrwskUANoDHZCQ2baD4JtmKLtdniyFTrzLcA8FYXrU22", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -471,7 +471,7 @@ Response: { } }, { - "digest": "AoaNoKrkQAW7R8epyboHAhrNmiJed7WqxUYHX2p9W3Gi", + "digest": "3FrntvUU8Ux144JNCT61VZ5qk9qLnR9gvShoCgcxFv8P", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -479,7 +479,7 @@ Response: { } }, { - "digest": "2LnbVjwp4WsEPTCttuU3Ae3ZaMYDbU9hAjAtYZHABfNU", + "digest": "87smnyKWh3RpPYV2aXCidayLJ9jGFyoEzCzESfHMFsCq", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -487,7 +487,7 @@ Response: { } }, { - "digest": "5Kh9fi4ppVyknuXtAPKszkh4iGGjLgoKLjUosLsJYrNM", + "digest": "CeEdmUCo7tyCDUKh7YQ8rdz3azzgkPaTV4NcxRPXmSSX", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -495,7 +495,7 @@ Response: { } }, { - "digest": "5hB8rPyv4pApk9abZStGxoJQ72ecDB4JmnR2Cd5CAQ5T", + "digest": "GsF7LSJASi27iAKzwz9JqAQJvCnQaNqNLWEwwDmBd7qt", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -503,7 +503,7 @@ Response: { } }, { - "digest": "3pNVMUJVJwDwUzebUReA3pXEHtyWLhGR1UeuGdZFPoNP", + "digest": "6CEEJu89tWrqRsnjEcCnerqNnkuMYNcyyz4eXR9eZo29", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -592,7 +592,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "4zKyKcWSZ8q5JAis9wDq6s6Dd2QK3xxZJGbj4kA3xeDs", + "digest": "FLLnF9WK3fJMnwMAVGzTLWXgyFNt8aFi2bvCisKoUua9", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp index 61af8b17941..9a3c60fa86b 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp @@ -42,7 +42,7 @@ Response: { "transactions": { "nodes": [ { - "package": "0x81fecfec8cda1ae043aaf7af6c09e893ed847c1551585cef97e4f66e48d2f979", + "package": "0xde05a185d0e080e1505a6a0b52a42a486dc3ade3c9e3995c4bc759aed17aa14b", "module": "m", "functionName": "get" } @@ -55,17 +55,17 @@ Response: { "nodes": [ { "__typename": "SharedObjectRead", - "address": "0x925dea6dd7c8fcb192b66c8ca68159433a2c4bc13a418b330d2da39c5dacb4ed", + "address": "0xa2b9736cb59ffe767e6aa6dec9c1109f8a2d9f7c9dae3254879e458e97ffade4", "version": 2, - "digest": "8sg1MfrfY93MygRY2VmiZNkq94uWETfK3BihkyMrgzag", + "digest": "86vCFvHX492P6v49Tdi4yf5UHThatkR4P5VcHb69UJnY", "object": { "asMoveObject": { "contents": { "type": { - "repr": "0x81fecfec8cda1ae043aaf7af6c09e893ed847c1551585cef97e4f66e48d2f979::m::Foo" + "repr": "0xde05a185d0e080e1505a6a0b52a42a486dc3ade3c9e3995c4bc759aed17aa14b::m::Foo" }, "json": { - "id": "0x925dea6dd7c8fcb192b66c8ca68159433a2c4bc13a418b330d2da39c5dacb4ed", + "id": "0xa2b9736cb59ffe767e6aa6dec9c1109f8a2d9f7c9dae3254879e458e97ffade4", "x": "0" } } @@ -82,7 +82,7 @@ Response: { "transactions": { "nodes": [ { - "package": "0x81fecfec8cda1ae043aaf7af6c09e893ed847c1551585cef97e4f66e48d2f979", + "package": "0xde05a185d0e080e1505a6a0b52a42a486dc3ade3c9e3995c4bc759aed17aa14b", "module": "m", "functionName": "inc" } @@ -102,12 +102,12 @@ Response: { "transactions": { "nodes": [ { - "package": "0x81fecfec8cda1ae043aaf7af6c09e893ed847c1551585cef97e4f66e48d2f979", + "package": "0xde05a185d0e080e1505a6a0b52a42a486dc3ade3c9e3995c4bc759aed17aa14b", "module": "m", "functionName": "get" }, { - "package": "0x81fecfec8cda1ae043aaf7af6c09e893ed847c1551585cef97e4f66e48d2f979", + "package": "0xde05a185d0e080e1505a6a0b52a42a486dc3ade3c9e3995c4bc759aed17aa14b", "module": "m", "functionName": "inc" } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp index b66219008ed..da862cdc336 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp @@ -7,7 +7,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx", + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu", "sender": null, "signatures": [ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" @@ -407,7 +407,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000008", "inner": { - "id": "0x64245391f93d86304a99e09b136505481f2374b4bf9e6aeeae25976310517f76", + "id": "0xbb7c7a925282d7c3baca21ceaa0b0db0cc4722ed2ea19ae76414fd8d45434090", "version": "1" } } @@ -489,7 +489,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000403", "lists": { - "id": "0xee738f1521522ab7f2c552e22cda46f96661774331fb5b4cd4577f0e31488488", + "id": "0x6428b348e41668b311839af722af0fb654bfb37792ad399a42477870db5c58bb", "size": "0" } } @@ -641,16 +641,19 @@ Response: { { "cursor": "eyJpIjoxMCwiYyI6MH0", "node": { - "address": "0x45dbc1fa6aa265ea050c6f6aa7e4e729de563d9c1c078e9e043654961030ef3e", + "address": "0x31a41d982a88318b928f81051ee4afe2cdc2a14fab057a0054aa9176470621c6", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota" }, "json": { - "id": "0x45dbc1fa6aa265ea050c6f6aa7e4e729de563d9c1c078e9e043654961030ef3e", - "name": "0xa03d52faa695d20a45273c3a571d79c5881257ec9bbd82f894d9b1271ae68ee2", - "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" + "id": "0x31a41d982a88318b928f81051ee4afe2cdc2a14fab057a0054aa9176470621c6", + "pool_id": "0x23c209f64eb8a623bd1a40080e00b8c71fe796539a2b4d8d727d211b69a0787d", + "stake_activation_epoch": "0", + "principal": { + "value": "1500000000000000" + } } } }, @@ -660,16 +663,20 @@ Response: { { "cursor": "eyJpIjoxMSwiYyI6MH0", "node": { - "address": "0x51e8c26146c1df0ca5c935c4e0b2d9a99ef83e9e201735f71e647f3b1255d56c", + "address": "0x41170536b261f09cf834f7561cb62ecb7a916a4944fb4e03b376744f61ae9647", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x51e8c26146c1df0ca5c935c4e0b2d9a99ef83e9e201735f71e647f3b1255d56c", - "balance": { - "value": "300000000000000" + "id": "0x41170536b261f09cf834f7561cb62ecb7a916a4944fb4e03b376744f61ae9647", + "decimals": 9, + "name": "IOTA", + "symbol": "IOTA", + "description": "The main (gas)token of the IOTA Network.", + "icon_url": { + "url": "https://iota.org/logo.png" } } } @@ -718,21 +725,16 @@ Response: { { "cursor": "eyJpIjoxMywiYyI6MH0", "node": { - "address": "0x681869e3055b2680391dd8aaf2bd5b842a638c7921870ca06ca2e553761d5912", + "address": "0x5a6892c61bb884922e6567f636ef9c6ad0550b0d2ba2ed363b3c0c21ebec29a2", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" }, "json": { - "id": "0x681869e3055b2680391dd8aaf2bd5b842a638c7921870ca06ca2e553761d5912", - "decimals": 9, - "name": "IOTA", - "symbol": "IOTA", - "description": "The main (gas)token of the IOTA Network.", - "icon_url": { - "url": "https://iota.org/logo.png" - } + "id": "0x5a6892c61bb884922e6567f636ef9c6ad0550b0d2ba2ed363b3c0c21ebec29a2", + "name": "0x23c209f64eb8a623bd1a40080e00b8c71fe796539a2b4d8d727d211b69a0787d", + "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" } } }, @@ -741,6 +743,30 @@ Response: { }, { "cursor": "eyJpIjoxNCwiYyI6MH0", + "node": { + "address": "0x67c78a960ae2478d20a0358519fc411998b577c8c30d25ab83eb5cba5389d377", + "asMoveObject": { + "contents": { + "type": { + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + }, + "json": { + "id": "0x67c78a960ae2478d20a0358519fc411998b577c8c30d25ab83eb5cba5389d377", + "name": "1", + "value": { + "version": "1", + "epoch": "0", + "randomness_round": "0", + "random_bytes": [] + } + } + } + }, + "asMovePackage": null + } + }, + { + "cursor": "eyJpIjoxNSwiYyI6MH0", "node": { "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", "asMoveObject": { @@ -757,7 +783,7 @@ Response: { "system_state_version": "1", "iota_treasury_cap": { "inner": { - "id": "0x862d63508303377f807e4c9ce89fa5b634ce6b008043f22433f253b27fc92b14", + "id": "0x451ccfba52d8652ccccbb87893927e6c2d8350d82054c7bf5f53126defe7b120", "total_supply": { "value": "31800000000000000" } @@ -1004,15 +1030,15 @@ Response: { "next_epoch_p2p_address": null, "next_epoch_primary_address": null, "extra_fields": { - "id": "0xdabf658011a9b3da6b4e71e6191b7770c5e76f4cc4d1da4b1c1424c062b57f07", + "id": "0x8c8cb631eb66322a2e15097fa46cc90bea1be77728f51e5e751db83d31dc957c", "size": "0" } }, "voting_power": "10000", - "operation_cap_id": "0x79994b0548d23ce03bd642b598c53f4b8cf20eab38292b2320a9cb6e1502c87a", + "operation_cap_id": "0xa85b72ce4875fd68d313b52635e0457122523e5bdd5326650a3f09d63fc15273", "gas_price": "1000", "staking_pool": { - "id": "0xa03d52faa695d20a45273c3a571d79c5881257ec9bbd82f894d9b1271ae68ee2", + "id": "0x23c209f64eb8a623bd1a40080e00b8c71fe796539a2b4d8d727d211b69a0787d", "activation_epoch": "0", "deactivation_epoch": null, "iota_balance": "1500000000000000", @@ -1021,14 +1047,14 @@ Response: { }, "pool_token_balance": "1500000000000000", "exchange_rates": { - "id": "0xbfde46aaacc31bdb8d0411fdba5bb4296c6fdc072a8dbae80944074fc7952028", + "id": "0x3ee5fc9d8d80db3348236af1e16371bf6fd5b84c0a152dafa71a417d92b18431", "size": "1" }, "pending_stake": "0", "pending_total_iota_withdraw": "0", "pending_pool_token_withdraw": "0", "extra_fields": { - "id": "0xf455b5850dc4209b0481eb309a0041259ccfb1fa2843e55e785e9ff5d4af7c5a", + "id": "0xc4dee835aa860dc8513109c81fbea105db0a7d72b24f6ec0b229548585d77a97", "size": "0" } }, @@ -1037,35 +1063,35 @@ Response: { "next_epoch_gas_price": "1000", "next_epoch_commission_rate": "200", "extra_fields": { - "id": "0x923d1346474058ee4f3819a1b25e526ca769c1536fb0ade6e3f97dd149d0ce1f", + "id": "0x4caee9386ae12709561e6c22d0be8450b87af79046bb50a2c54e937b3a09b08f", "size": "0" } } ], "pending_active_validators": { "contents": { - "id": "0xf8dc8eeba758061f21dc5684a06e256e96849b1f22f1f851925452eb482c8eaa", + "id": "0x1bc44ad65edf752060b10fddcaeddede3e9aed84b615b3337c6bc67f84621dd7", "size": "0" } }, "pending_removals": [], "staking_pool_mappings": { - "id": "0xf85a9c08864de10f1d7e61e50f5d9e126b65590e19629121ac85d46f8006a0b6", + "id": "0xd240df03d3bdf05df7da8ca47045abad4fea4426d33b93f5edcb08d61227f71a", "size": "1" }, "inactive_validators": { - "id": "0xc51471ea897ce3f100e6139ce44a8778e167700ec3bc470cbba84da31f2812e1", + "id": "0x0e85fbf07427c1dd2bb118a3ee048e1827082b8ecf98701a55ba6a1526ed32ba", "size": "0" }, "validator_candidates": { - "id": "0xabda552c6a55960a548cc7bb17ea12e5d74b0d110627d53d6a5d09e8cbefc1aa", + "id": "0xdac5d93b94c6dfea4a289ec969efea75facb070e2761e578a59b08e146358022", "size": "0" }, "at_risk_validators": { "contents": [] }, "extra_fields": { - "id": "0x5b30d95c028bbbcee4c6ce4282d4c1bca38a5e40875abe1ea8531ae1b6037d85", + "id": "0xdf8c3cfcfcca616c9b14efb4b99739953f4bfc8218409e8d460a7703d2e2f223", "size": "0" } }, @@ -1086,7 +1112,7 @@ Response: { "validator_very_low_stake_threshold": "1000000000000000", "validator_low_stake_grace_period": "7", "extra_fields": { - "id": "0xf72dcf525876ce27556d1cf350dae51b5c6bb23956d41f6494941d38309fc48e", + "id": "0x4cfadd6636c11aefdfdf925c23ad5a783841e3a7bf365df462170f78db0ab9a6", "size": "0" } }, @@ -1105,7 +1131,7 @@ Response: { "safe_mode_non_refundable_storage_fee": "0", "epoch_start_timestamp_ms": "0", "extra_fields": { - "id": "0x13653a79a25720aa3e179ba31ef4c916fbaa5d8594ed96451cfef42866272480", + "id": "0x05259c002166a7d09f851a91c8a0a9867d11e76f20f8ff519795b68d8d231302", "size": "0" } } @@ -1115,39 +1141,19 @@ Response: { "asMovePackage": null } }, - { - "cursor": "eyJpIjoxNSwiYyI6MH0", - "node": { - "address": "0x79994b0548d23ce03bd642b598c53f4b8cf20eab38292b2320a9cb6e1502c87a", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap" - }, - "json": { - "id": "0x79994b0548d23ce03bd642b598c53f4b8cf20eab38292b2320a9cb6e1502c87a", - "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" - } - } - }, - "asMovePackage": null - } - }, { "cursor": "eyJpIjoxNiwiYyI6MH0", "node": { - "address": "0x874cd6b1950b41facb75642efb93086de732df26f262036684b209971233adf6", + "address": "0x70870c0c96fcd9253d8b91a8e593008bf34bc4dd7392528ede52cd36e9961386", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x874cd6b1950b41facb75642efb93086de732df26f262036684b209971233adf6", - "pool_id": "0xa03d52faa695d20a45273c3a571d79c5881257ec9bbd82f894d9b1271ae68ee2", - "stake_activation_epoch": "0", - "principal": { - "value": "1500000000000000" + "id": "0x70870c0c96fcd9253d8b91a8e593008bf34bc4dd7392528ede52cd36e9961386", + "balance": { + "value": "300000000000000" } } } @@ -1158,14 +1164,14 @@ Response: { { "cursor": "eyJpIjoxNywiYyI6MH0", "node": { - "address": "0xbb85fe8b6ec147c867b7ab232b89b244ddf1d18e35b6ec47d4258b663059930a", + "address": "0x7a20c8753262756c51a5f59239412eac36d9df4485efbef17e3ae75581745206", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" }, "json": { - "id": "0xbb85fe8b6ec147c867b7ab232b89b244ddf1d18e35b6ec47d4258b663059930a", + "id": "0x7a20c8753262756c51a5f59239412eac36d9df4485efbef17e3ae75581745206", "name": "0", "value": { "iota_amount": "0", @@ -1180,21 +1186,51 @@ Response: { { "cursor": "eyJpIjoxOCwiYyI6MH0", "node": { - "address": "0xc4929aa8e82af543ad1bd995384f8a7ef5d9013e9157eba19386040ba3142c56", + "address": "0x8ab0eae9b1298cb4b057ef90a16895b1d88d6778f8085eaf0441cf9335a68df3", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" }, "json": { - "id": "0xc4929aa8e82af543ad1bd995384f8a7ef5d9013e9157eba19386040ba3142c56", - "name": "1", - "value": { - "version": "1", - "epoch": "0", - "randomness_round": "0", - "random_bytes": [] - } + "id": "0x8ab0eae9b1298cb4b057ef90a16895b1d88d6778f8085eaf0441cf9335a68df3", + "fields": { + "contents": [ + { + "key": "name", + "value": "{immutable_metadata.name}" + }, + { + "key": "image_url", + "value": "{immutable_metadata.uri}" + }, + { + "key": "description", + "value": "{immutable_metadata.description}" + }, + { + "key": "creator", + "value": "{immutable_metadata.issuer_name}" + }, + { + "key": "version", + "value": "{immutable_metadata.version}" + }, + { + "key": "media_type", + "value": "{immutable_metadata.media_type}" + }, + { + "key": "collection_name", + "value": "{immutable_metadata.collection_name}" + }, + { + "key": "immutable_issuer", + "value": "{immutable_issuer}" + } + ] + }, + "version": 1 } } }, @@ -1204,17 +1240,15 @@ Response: { { "cursor": "eyJpIjoxOSwiYyI6MH0", "node": { - "address": "0xeaaefbe68cb12a738b9900cae483e21a64774a96ae31057197e557f3ea37449f", + "address": "0xa85b72ce4875fd68d313b52635e0457122523e5bdd5326650a3f09d63fc15273", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap" }, "json": { - "id": "0xeaaefbe68cb12a738b9900cae483e21a64774a96ae31057197e557f3ea37449f", - "balance": { - "value": "30000000000000000" - } + "id": "0xa85b72ce4875fd68d313b52635e0457122523e5bdd5326650a3f09d63fc15273", + "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" } } }, @@ -1261,7 +1295,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "digest": "FqMtZucg8Kq9QV3eNTvV9M15EyWj3ECNKC12qfudsDru" + "digest": "ACniz6nQTCUstttMDbQeqiGXLWkueKQdS7KHYcvMYaxm" } }, { @@ -1270,7 +1304,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000002", - "digest": "E7uXTMYN2oQ15g7Xd8vR1TV3bABDAn2PPVPz9H1qXj52" + "digest": "5Wxegx1pgGswtXUSYTsengtz92uh5ymTBATUZy9Jr2qR" } }, { @@ -1279,7 +1313,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000003", - "digest": "6PG85JzqvBkA1PSWhjhmPSGQXVxcvGjA5e3hjZP7dwBh" + "digest": "4wJq3g9AF3SLyM1gfhZYwU2UdHqzhYJNccnrc9nxxN1e" } }, { @@ -1288,7 +1322,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000005", - "digest": "14PhfJCzB1D6yKDPC62RRBFuxL3fSPj2TcTCKMtekbma" + "digest": "7P8woxjCXN9U217GFUTSHy3zVZgaNPvS1qXUDD2dFnJW" } }, { @@ -1297,7 +1331,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000006", - "digest": "13t46kxDvMkddcwtFXAWLCK2ryVEh6b1yNJLfPDwf5ne" + "digest": "GFpx8vqCvvMCsyFR7WQLVdro6r3BbHJvWSUZ7ZAVecYQ" } }, { @@ -1306,7 +1340,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000008", - "digest": "3kTwojhZSxhQQgyKqQdBmfHjqhNM1bXK3KXXheMrgZMC" + "digest": "HjM5V1MHEvVzgGMD4Dn3LYZMUZD2CY1zCjXooziYgfUY" } }, { @@ -1315,7 +1349,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000000b", - "digest": "8G372JGHTJJvDN7r67itdCve4PxkXAct7Jajed2jkWBv" + "digest": "3McYpRRK4tiUF3wY37Eoz6Wdt7GeDH4wiFx2gbjgEzrq" } }, { @@ -1324,7 +1358,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000403", - "digest": "FHJUE3aPtVYZf4fbLgYdEk7vFB9Jo5AcfGg8Ji9BuQV8" + "digest": "DrEt1ECKgj2v2V5LNUCV1Egz1pHbYMVGTm2TYxcBwmJL" } }, { @@ -1333,7 +1367,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000107a", - "digest": "7FrGBvKzGaWfHaNkT7TRN8wecP1gcuURGK6sApUjc6ir" + "digest": "7TBMz7SZrHMeWQpbum96xiNFSgYNMHir9iwa6pZhFyog" } }, { @@ -1342,25 +1376,25 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000dee9", - "digest": "A9k6BCqVW7zBTdQdr7CnCErDGYwKmJijyTyQqgfUzPGh" + "digest": "BKw6esRr9Gz3HA5Qq3r6L2RRZSEgESgWmtNzgT33LzU9" } }, { - "address": "0x45dbc1fa6aa265ea050c6f6aa7e4e729de563d9c1c078e9e043654961030ef3e", + "address": "0x31a41d982a88318b928f81051ee4afe2cdc2a14fab057a0054aa9176470621c6", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x45dbc1fa6aa265ea050c6f6aa7e4e729de563d9c1c078e9e043654961030ef3e", - "digest": "4S5VPqmC9CnjESxHHYF4v1mftEvN9PaRJDzg3nJ2DmME" + "address": "0x31a41d982a88318b928f81051ee4afe2cdc2a14fab057a0054aa9176470621c6", + "digest": "JDjrU18uP5c2XtgPfsQYqzT9sXwxQGoNxJJxwC9zfLBf" } }, { - "address": "0x51e8c26146c1df0ca5c935c4e0b2d9a99ef83e9e201735f71e647f3b1255d56c", + "address": "0x41170536b261f09cf834f7561cb62ecb7a916a4944fb4e03b376744f61ae9647", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x51e8c26146c1df0ca5c935c4e0b2d9a99ef83e9e201735f71e647f3b1255d56c", - "digest": "AVFcpLipQ2Qv6DqMeX5v6KmAJzFdbD97Xx5eyQkdudAj" + "address": "0x41170536b261f09cf834f7561cb62ecb7a916a4944fb4e03b376744f61ae9647", + "digest": "6bF2KUYageKgaGqYVTjdS5DakwEdP7An2Yu3gYgXAVE" } }, { @@ -1369,70 +1403,70 @@ Response: { "idDeleted": false, "outputState": { "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", - "digest": "FnLwiFscb5G5wgumck3xFUstJW4Khq5fwp3dFX4jPsGq" + "digest": "9DeUoBdwirvTGBax3y1EwK9XVP3qWZQuwGVMcPFjETXp" } }, { - "address": "0x681869e3055b2680391dd8aaf2bd5b842a638c7921870ca06ca2e553761d5912", + "address": "0x5a6892c61bb884922e6567f636ef9c6ad0550b0d2ba2ed363b3c0c21ebec29a2", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x681869e3055b2680391dd8aaf2bd5b842a638c7921870ca06ca2e553761d5912", - "digest": "BFQLZfosURZrNbckqj3j8Ue81LMJbUbDtbCbofwTtZwP" + "address": "0x5a6892c61bb884922e6567f636ef9c6ad0550b0d2ba2ed363b3c0c21ebec29a2", + "digest": "4t2zDWTsgsiujCXtd97er2yLohEq68R5884UMTDbYdan" } }, { - "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "address": "0x67c78a960ae2478d20a0358519fc411998b577c8c30d25ab83eb5cba5389d377", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "digest": "C93UhbkSunpDSB17Zk3sU3M6oeBwHpaLmcJKrH6sBNvR" + "address": "0x67c78a960ae2478d20a0358519fc411998b577c8c30d25ab83eb5cba5389d377", + "digest": "HkC9Y8uSY9X1V4oqrFR3Vko2f1yATNUPhpxKUkDSUFgD" } }, { - "address": "0x79994b0548d23ce03bd642b598c53f4b8cf20eab38292b2320a9cb6e1502c87a", + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x79994b0548d23ce03bd642b598c53f4b8cf20eab38292b2320a9cb6e1502c87a", - "digest": "5dgGjiQitdPuRcsQrCp2TULGGoo8dVFSBcvh5fdbo1y4" + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "digest": "2jW8BjxfJduJi1nk6Tssvf4CZFqkHgKDRXja65cXamBB" } }, { - "address": "0x874cd6b1950b41facb75642efb93086de732df26f262036684b209971233adf6", + "address": "0x70870c0c96fcd9253d8b91a8e593008bf34bc4dd7392528ede52cd36e9961386", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x874cd6b1950b41facb75642efb93086de732df26f262036684b209971233adf6", - "digest": "FZR3VA4xcX4GoXDuFZG9baVNAGtGEEXiAgUuZyYeDw2C" + "address": "0x70870c0c96fcd9253d8b91a8e593008bf34bc4dd7392528ede52cd36e9961386", + "digest": "FjpzYpw4ExuYTrGWxFiFs7r7oeP4DXq51Nif29WAb41o" } }, { - "address": "0xbb85fe8b6ec147c867b7ab232b89b244ddf1d18e35b6ec47d4258b663059930a", + "address": "0x7a20c8753262756c51a5f59239412eac36d9df4485efbef17e3ae75581745206", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xbb85fe8b6ec147c867b7ab232b89b244ddf1d18e35b6ec47d4258b663059930a", - "digest": "GN988s2Y7Sbxiw7cpbQVD5jfHT1swhD7jTCaxsk4Za79" + "address": "0x7a20c8753262756c51a5f59239412eac36d9df4485efbef17e3ae75581745206", + "digest": "9k9dmWgnNrnXAjWw72hPo6xEkFnvpNQkpqYdLmxybcXL" } }, { - "address": "0xc4929aa8e82af543ad1bd995384f8a7ef5d9013e9157eba19386040ba3142c56", + "address": "0x8ab0eae9b1298cb4b057ef90a16895b1d88d6778f8085eaf0441cf9335a68df3", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc4929aa8e82af543ad1bd995384f8a7ef5d9013e9157eba19386040ba3142c56", - "digest": "C72bNNQVye2tACfrgVvdzPFk2FoabBZ7CeKDvq1ZW9dP" + "address": "0x8ab0eae9b1298cb4b057ef90a16895b1d88d6778f8085eaf0441cf9335a68df3", + "digest": "6DtKS9WuGtbYBuovhQ3rpyqyvmvYgPPdkxGbC3pFsB4c" } }, { - "address": "0xeaaefbe68cb12a738b9900cae483e21a64774a96ae31057197e557f3ea37449f", + "address": "0xa85b72ce4875fd68d313b52635e0457122523e5bdd5326650a3f09d63fc15273", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xeaaefbe68cb12a738b9900cae483e21a64774a96ae31057197e557f3ea37449f", - "digest": "FcPs3Nxpp6LhuD6Xi8h8ssnCXYhh61fYsMCbarCPzpDA" + "address": "0xa85b72ce4875fd68d313b52635e0457122523e5bdd5326650a3f09d63fc15273", + "digest": "8hMJJSADDKKAQGyVRjXBzCwr89JJ5hqBVSC9aeuAq9xj" } } ] @@ -1454,7 +1488,7 @@ Response: { "sequenceNumber": 0 }, "transactionBlock": { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } }, "expiration": null @@ -1506,7 +1540,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } ] }, @@ -1606,7 +1640,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "3Q2jsrXKU4XeL54Zha5iaGZ1o8vS8v2w1yNmzctFP8nx" + "digest": "ewKoT2EtePG9StUmgAgkjAV3e9WXW7BuaRHUQdshnbu" } ] }, @@ -1621,7 +1655,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000005", - "digest": "CGyGKFu385GVbKPD57rNrb1fPoLg1G3trazCFvfNWFXF" + "digest": "Do9BxST2vAmc7ZRsxohXXg5S3QLzmgUYYQnP2ejXtP93" } }, { @@ -1630,31 +1664,25 @@ Response: { "idDeleted": false, "outputState": { "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d", - "digest": "EoM3cVCZHPGBwDKUrnBWyPnJcMHsBALsEcCdq85AKEtx" + "digest": "3sf5jy43KZnX2z3htBQ3XnNpAQYPcBrd7smTT7BN1a5z" } }, { - "address": "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1", - "idCreated": true, + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1", - "digest": "HSrKyJrhztCE3pE1H3MwzsrCPLmWbWV6e9J4rnCNdMRP" + "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", + "digest": "GS7ZfUqukn49TvLTvEYmxcHxZmd72CGCyt6HvmybQK1e" } }, { - "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "idCreated": false, - "idDeleted": true, - "outputState": null - }, - { - "address": "0xfd27bf6efc37fc3de219ef5d16c3094c3dfe5c43394c8b8d4e22ad0e98dda500", + "address": "0xa70556ca435be30f1bf02dad46d7bf539291fb8e407bfd011551bd51308d074e", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xfd27bf6efc37fc3de219ef5d16c3094c3dfe5c43394c8b8d4e22ad0e98dda500", - "digest": "AUqUZbUJ46XKxaFJy8F26vdxepvvPeYBJoMefc9ahKeM" + "address": "0xa70556ca435be30f1bf02dad46d7bf539291fb8e407bfd011551bd51308d074e", + "digest": "HS1cAhSUTBCap9DHQybC3tBLtvDbVVUCEUHabjRNRuQB" } } ] From e442ae81cf3d65cb1c76b5a8e3ca54da633f2b5a Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 14:00:17 +0200 Subject: [PATCH 45/62] fix(iota-swarm-config): test baseline --- ..._populated_genesis_snapshot_matches-2.snap | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap b/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap index ae0cb8c12c2..2e9909ef31f 100644 --- a/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap +++ b/crates/iota-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap @@ -8,7 +8,7 @@ system_state_version: 1 iota_treasury_cap: inner: id: - id: "0xbcc56dc228d08d0d9324efb875272bdc9d3cd65c80c81b229549352212b1603a" + id: "0x7ba2382d99d4d34f39d55677d3cf8bace68ff9b414395e823f4b3b1f5b8779a9" total_supply: value: "751500000000000000" validators: @@ -244,13 +244,13 @@ validators: next_epoch_primary_address: ~ extra_fields: id: - id: "0x6e1a6eab42d57998689e98043933df58e0cc685a595e02eb98c31e8747e2075f" + id: "0x97c484626382f82340e8e1c6989a57d5ffd3471dadcb3d5405453f93f43cc9b0" size: 0 voting_power: 10000 - operation_cap_id: "0xa8a7a177bc4241ba371708657809a230f36b5438bb47de2c194340bbf9be5a4c" + operation_cap_id: "0x12c601377e08b9b1a4fc1eabbbd20e34f665b8a8d123c4ae0006afbdff96933b" gas_price: 1000 staking_pool: - id: "0xd6303962a98fb58ec8161738bfe41b57b75ff1cd98eea0f5bf20f7950bfa89bc" + id: "0x4aaac511139597b1acd68475f3cf9a40a261d026db793d9bb9213228a6bc3a24" activation_epoch: 0 deactivation_epoch: ~ iota_balance: 1500000000000000 @@ -258,14 +258,14 @@ validators: value: 0 pool_token_balance: 1500000000000000 exchange_rates: - id: "0x92be067395b6a056a83502dd1dc7f11ea5d5a895af950bb9a601ab2f04564307" + id: "0x358794a785d7ea4e4b953814e677ad1d3d580e480d99ee32fe7133f1aad50d8b" size: 1 pending_stake: 0 pending_total_iota_withdraw: 0 pending_pool_token_withdraw: 0 extra_fields: id: - id: "0x4cb9e52c1bde4fb125bc645a7e10f84a933f9a5a2bb033150818c3a3c0a715f4" + id: "0x215369ce1b8cd5ae13d92e7466d6448898f63362e92c22db9ed671bee1fd6e37" size: 0 commission_rate: 200 next_epoch_stake: 1500000000000000 @@ -273,27 +273,27 @@ validators: next_epoch_commission_rate: 200 extra_fields: id: - id: "0xb71bf2d65890434770555a17b390f685fe1a3156788c87ed9103dda374a56d23" + id: "0xb124b29bc0bb01f4ba0833d2c52c860614def31cbe0cb6bb2500d20a2ef518aa" size: 0 pending_active_validators: contents: - id: "0x863b489d464eeba819e5e7b89105699a996e2012951cf81cc407b97f33667f0f" + id: "0x894ec4c364d05c6d7b8c65d791261efe8c07a1c38ba843a3a37df40536cc2c6f" size: 0 pending_removals: [] staking_pool_mappings: - id: "0xa2c1ea03cd0de682cb3becef4243df26fdfb71d76947e21a10d82121b75dad6a" + id: "0x81109e3abf78a50ba7f74a043049c5a3df88c848e929913da5c287e5f0e1de86" size: 1 inactive_validators: - id: "0x4319c9e20eb938ab6bacc279a4d0f846d306df456557ea5a62abf366aeee47bb" + id: "0xed8eaac07f4ccec9088a814ec9169a8ec87586f15797ff6d4b80d089a95c724c" size: 0 validator_candidates: - id: "0xc0ef087d4b78a311a59f919930baecdd9ce6ae9f143f20c70d86d2f6a3cb24f4" + id: "0x9c0ce6b24517363f21e543c12a51ed36ff4a252d9446ec6aaffc9074faed79ff" size: 0 at_risk_validators: contents: [] extra_fields: id: - id: "0xbcedd10b11e3cb1337e0a1e0cd51e0932756ccbd28b2452721031587be408298" + id: "0xf8f51ed1b0cc6fbe3a803637728dd8e21f07f90eb3a5acde5ae2f9df3a0f222e" size: 0 storage_fund: total_object_storage_rebates: @@ -302,6 +302,7 @@ storage_fund: value: 0 parameters: epoch_duration_ms: 86400000 + min_validator_count: 4 max_validator_count: 150 min_validator_joining_stake: 2000000000000000 validator_low_stake_threshold: 1500000000000000 @@ -309,7 +310,7 @@ parameters: validator_low_stake_grace_period: 7 extra_fields: id: - id: "0x58471edf0cdb26470191f3e31730ed38bf6c691a29d281f6ee936d2d4bdfb179" + id: "0x552e25d51ce8d5164c92471ac952a46a93645fa8337f00abe6cec8a87e89423c" size: 0 reference_gas_price: 1000 validator_report_records: @@ -324,5 +325,5 @@ safe_mode_non_refundable_storage_fee: 0 epoch_start_timestamp_ms: 10 extra_fields: id: - id: "0xd836d6b9f016d4aafda8fa979b639a76bdeca422b665981c7894ab49f0e42a8f" + id: "0xfc995fb81559a3d5e8e8e186bb6fc16a906e2b789ecb032e977003f3498f49b7" size: 0 From de14819a5069863c22296153857214d5ea11e068 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 24 Oct 2024 21:17:47 +0800 Subject: [PATCH 46/62] feat(iota-open-rpc, sdk): Update spec and typescript types --- crates/iota-open-rpc/spec/openrpc.json | 4 ++-- sdk/typescript/src/client/types/generated.ts | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/crates/iota-open-rpc/spec/openrpc.json b/crates/iota-open-rpc/spec/openrpc.json index c00c9969ae0..03a6799c64d 100644 --- a/crates/iota-open-rpc/spec/openrpc.json +++ b/crates/iota-open-rpc/spec/openrpc.json @@ -10066,7 +10066,7 @@ "code": { "type": "string", "enum": [ - "displayError" + "display" ] }, "error": { @@ -11296,7 +11296,7 @@ "kind": { "type": "string", "enum": [ - "AuthenticatorStateUpdate" + "AuthenticatorStateUpdateV1" ] }, "new_active_jwks": { diff --git a/sdk/typescript/src/client/types/generated.ts b/sdk/typescript/src/client/types/generated.ts index 002decccf4e..adf84565085 100644 --- a/sdk/typescript/src/client/types/generated.ts +++ b/sdk/typescript/src/client/types/generated.ts @@ -228,7 +228,7 @@ export interface EndOfEpochInfo { epochEndTimestamp: string; lastCheckpointId: string; mintedTokensAmount: string; - /** existing fields from `SystemEpochInfoEvent` (without epoch) */ + /** existing fields from `SystemEpochInfoEventV1` (without epoch) */ protocolVersion: string; referenceGasPrice: string; storageCharge: string; @@ -800,6 +800,7 @@ export type IotaTransactionBlockBuilderMode = 'Commit' | 'DevInspect'; * fields so that they are decoupled from the internal definitions. */ export interface IotaValidatorSummary { + authorityPubkeyBytes: string; commissionRate: string; description: string; /** ID of the exchange rate table object. */ @@ -812,6 +813,7 @@ export interface IotaValidatorSummary { name: string; netAddress: string; networkPubkeyBytes: string; + nextEpochAuthorityPubkeyBytes?: string | null; nextEpochCommissionRate: string; nextEpochGasPrice: string; nextEpochNetAddress?: string | null; @@ -821,8 +823,6 @@ export interface IotaValidatorSummary { nextEpochProofOfPossession?: string | null; nextEpochProtocolPubkeyBytes?: string | null; nextEpochStake: string; - nextEpochWorkerAddress?: string | null; - nextEpochWorkerPubkeyBytes?: string | null; operationCapId: string; p2pAddress: string; /** Pending pool token withdrawn during the current epoch, emptied at epoch boundaries. */ @@ -848,8 +848,6 @@ export interface IotaValidatorSummary { /** The total number of IOTA tokens in this pool. */ stakingPoolIotaBalance: string; votingPower: string; - workerAddress: string; - workerPubkeyBytes: string; } export interface MoveCallMetrics { /** The count of calls of each function in the last 30 days. */ @@ -1114,7 +1112,7 @@ export type ObjectResponseError = code: 'unknown'; } | { - code: 'displayError'; + code: 'display'; error: string; }; export interface IotaObjectResponseQuery { @@ -1481,7 +1479,7 @@ export type IotaTransactionBlockKind = } /** A transaction which updates global authenticator state */ | { epoch: string; - kind: 'AuthenticatorStateUpdate'; + kind: 'AuthenticatorStateUpdateV1'; new_active_jwks: IotaActiveJwk[]; round: string; } /** A transaction which updates global randomness state */ From e1906ac8d0221ceea3ac3b0d39f5e1d4f03a1117 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 24 Oct 2024 22:03:07 +0800 Subject: [PATCH 47/62] refactor(iota-graphql-rpc): Remove version of AuthenticatorStateUpdateTransaction and keep it in the inner type only --- .../transaction_block_kind/authenticator_state_update.rs | 8 ++++---- .../src/types/transaction_block_kind/mod.rs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs b/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs index 6766706b014..d543670d4f8 100644 --- a/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs +++ b/crates/iota-graphql-rpc/src/types/transaction_block_kind/authenticator_state_update.rs @@ -8,7 +8,7 @@ use async_graphql::{ }; use iota_types::{ authenticator_state::ActiveJwk as NativeActiveJwk, - transaction::AuthenticatorStateUpdateV1 as NativeAuthenticatorStateUpdateV1Transaction, + transaction::AuthenticatorStateUpdateV1 as NativeAuthenticatorStateUpdateTransactionV1, }; use crate::{ @@ -21,8 +21,8 @@ use crate::{ }; #[derive(Clone, PartialEq, Eq)] -pub(crate) struct AuthenticatorStateUpdateV1Transaction { - pub native: NativeAuthenticatorStateUpdateV1Transaction, +pub(crate) struct AuthenticatorStateUpdateTransaction { + pub native: NativeAuthenticatorStateUpdateTransactionV1, /// The checkpoint sequence number this was viewed at. pub checkpoint_viewed_at: u64, } @@ -39,7 +39,7 @@ struct ActiveJwk { /// System transaction for updating the on-chain state used by zkLogin. #[Object] -impl AuthenticatorStateUpdateV1Transaction { +impl AuthenticatorStateUpdateTransaction { /// Epoch of the authenticator state update transaction. async fn epoch(&self, ctx: &Context<'_>) -> Result> { Epoch::query(ctx, Some(self.native.epoch), self.checkpoint_viewed_at) diff --git a/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs b/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs index 988c3582aa7..5d0c4f8685c 100644 --- a/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs +++ b/crates/iota-graphql-rpc/src/types/transaction_block_kind/mod.rs @@ -10,7 +10,7 @@ use self::{ randomness_state_update::RandomnessStateUpdateTransaction, }; use crate::types::transaction_block_kind::{ - authenticator_state_update::AuthenticatorStateUpdateV1Transaction, + authenticator_state_update::AuthenticatorStateUpdateTransaction, end_of_epoch::EndOfEpochTransaction, programmable::ProgrammableTransactionBlock, }; @@ -28,7 +28,7 @@ pub(crate) enum TransactionBlockKind { ConsensusCommitPrologue(ConsensusCommitPrologueTransaction), Genesis(GenesisTransaction), Programmable(ProgrammableTransactionBlock), - AuthenticatorState(AuthenticatorStateUpdateV1Transaction), + AuthenticatorState(AuthenticatorStateUpdateTransaction), Randomness(RandomnessStateUpdateTransaction), EndOfEpoch(EndOfEpochTransaction), } @@ -54,7 +54,7 @@ impl TransactionBlockKind { }) } K::AuthenticatorStateUpdateV1(asu) => { - T::AuthenticatorState(AuthenticatorStateUpdateV1Transaction { + T::AuthenticatorState(AuthenticatorStateUpdateTransaction { native: asu, checkpoint_viewed_at, }) From 1c50f8f38d3d5f8f0c64a62b121f3591ea19d9c8 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 24 Oct 2024 22:04:32 +0800 Subject: [PATCH 48/62] refactor(iota-types): Rename new_v1() of ExecuteTransactionRequestV1 to new() --- crates/iota-core/src/quorum_driver/tests.rs | 24 +++++++++---------- .../iota-e2e-tests/tests/full_node_tests.rs | 6 ++--- .../tests/transaction_orchestrator_tests.rs | 6 ++--- crates/iota-types/src/quorum_driver_types.rs | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/crates/iota-core/src/quorum_driver/tests.rs b/crates/iota-core/src/quorum_driver/tests.rs index 5f0a5be614f..7f3f94659c4 100644 --- a/crates/iota-core/src/quorum_driver/tests.rs +++ b/crates/iota-core/src/quorum_driver/tests.rs @@ -96,7 +96,7 @@ async fn test_quorum_driver_submit_transaction() { assert_eq!(*effects_cert.data().transaction_digest(), digest); }); let ticket = quorum_driver_handler - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx)) .await .unwrap(); verify_ticket_response(ticket, &digest).await; @@ -130,7 +130,7 @@ async fn test_quorum_driver_submit_transaction_no_ticket() { }); quorum_driver_handler .submit_transaction_no_ticket( - ExecuteTransactionRequestV1::new_v1(tx), + ExecuteTransactionRequestV1::new(tx), Some(SocketAddr::new([127, 0, 0, 1].into(), 0)), ) .await @@ -175,7 +175,7 @@ async fn test_quorum_driver_with_given_notify_read() { }); let ticket1 = notifier.register_one(&digest); let ticket2 = quorum_driver_handler - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx)) .await .unwrap(); verify_ticket_response(ticket1, &digest).await; @@ -212,7 +212,7 @@ async fn test_quorum_driver_update_validators_and_max_retry_times() { // This error should not happen in practice for benign validators and a working // client let ticket = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx)) .await .unwrap(); // We have a timeout here to make the test fail fast if fails @@ -305,7 +305,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx2 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx2)) .await .unwrap() .await; @@ -357,7 +357,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx2 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx2)) .await .unwrap() .await; @@ -393,7 +393,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx2_digest = *tx2.digest(); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx2)) .await .unwrap() .await @@ -432,7 +432,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx3 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx3)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx3)) .await .unwrap() .await; @@ -481,7 +481,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { .is_ok() ); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx2)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx2)) .await .unwrap() .await; @@ -531,7 +531,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { ); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx)) .await .unwrap() .await @@ -566,7 +566,7 @@ async fn test_quorum_driver_object_locked() -> Result<(), anyhow::Error> { let tx4 = make_tx(&gas, sender, &keypair, rgp); let res = quorum_driver - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx4.clone())) + .submit_transaction(ExecuteTransactionRequestV1::new(tx4.clone())) .await .unwrap() .await; @@ -657,7 +657,7 @@ async fn test_quorum_driver_handling_overload_and_retry() { // Submit the transaction, and check that it shouldn't return, and the number of // retries is within 300s timeout / 30s retry after duration = 10 times. let ticket = quorum_driver_handler - .submit_transaction(ExecuteTransactionRequestV1::new_v1(tx)) + .submit_transaction(ExecuteTransactionRequestV1::new(tx)) .await .unwrap(); match timeout(Duration::from_secs(300), ticket).await { diff --git a/crates/iota-e2e-tests/tests/full_node_tests.rs b/crates/iota-e2e-tests/tests/full_node_tests.rs index 6db42c7b4ba..899f314b5ad 100644 --- a/crates/iota-e2e-tests/tests/full_node_tests.rs +++ b/crates/iota-e2e-tests/tests/full_node_tests.rs @@ -749,7 +749,7 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E let digest = *txn.digest(); let res = transaction_orchestrator .execute_transaction_block( - ExecuteTransactionRequestV1::new_v1(txn), + ExecuteTransactionRequestV1::new(txn), ExecuteTransactionRequestType::WaitForLocalExecution, None, ) @@ -784,7 +784,7 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E let digest = *txn.digest(); let res = transaction_orchestrator .execute_transaction_block( - ExecuteTransactionRequestV1::new_v1(txn), + ExecuteTransactionRequestV1::new(txn), ExecuteTransactionRequestType::WaitForEffectsCert, None, ) @@ -1194,7 +1194,7 @@ async fn test_pass_back_no_object() -> Result<(), anyhow::Error> { let digest = *tx.digest(); let _res = transaction_orchestrator .execute_transaction_block( - ExecuteTransactionRequestV1::new_v1(tx), + ExecuteTransactionRequestV1::new(tx), ExecuteTransactionRequestType::WaitForLocalExecution, None, ) diff --git a/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs b/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs index 0eba2c0b471..5248c92e6da 100644 --- a/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs +++ b/crates/iota-e2e-tests/tests/transaction_orchestrator_tests.rs @@ -51,7 +51,7 @@ async fn test_blocking_execution() -> Result<(), anyhow::Error> { orchestrator .quorum_driver() .submit_transaction_no_ticket( - ExecuteTransactionRequestV1::new_v1(txn), + ExecuteTransactionRequestV1::new(txn), Some(make_socket_addr()), ) .await?; @@ -256,7 +256,7 @@ async fn test_tx_across_epoch_boundaries() { tokio::task::spawn(async move { match to .execute_transaction_block( - ExecuteTransactionRequestV1::new_v1(tx.clone()), + ExecuteTransactionRequestV1::new(tx.clone()), ExecuteTransactionRequestType::WaitForEffectsCert, None, ) @@ -299,7 +299,7 @@ async fn execute_with_orchestrator( request_type: ExecuteTransactionRequestType, ) -> Result<(ExecuteTransactionResponseV1, IsTransactionExecutedLocally), QuorumDriverError> { orchestrator - .execute_transaction_block(ExecuteTransactionRequestV1::new_v1(txn), request_type, None) + .execute_transaction_block(ExecuteTransactionRequestV1::new(txn), request_type, None) .await } diff --git a/crates/iota-types/src/quorum_driver_types.rs b/crates/iota-types/src/quorum_driver_types.rs index a81e81b3556..8a8a0e15c15 100644 --- a/crates/iota-types/src/quorum_driver_types.rs +++ b/crates/iota-types/src/quorum_driver_types.rs @@ -158,7 +158,7 @@ pub struct ExecuteTransactionRequestV1 { } impl ExecuteTransactionRequestV1 { - pub fn new_v1>(transaction: T) -> Self { + pub fn new>(transaction: T) -> Self { Self { transaction: transaction.into(), include_events: true, From 87b94856705ee8556ad036c41b65f1e0a5167293 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 24 Oct 2024 22:06:34 +0800 Subject: [PATCH 49/62] refactor(iota-swarm-config): Rename StateAccumulatorV1EnabledCallback to StateAccumulatorEnabledCallback --- crates/iota-swarm-config/src/network_config_builder.rs | 6 +++--- crates/test-cluster/src/lib.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/iota-swarm-config/src/network_config_builder.rs b/crates/iota-swarm-config/src/network_config_builder.rs index a3fa3b5cb9c..cf9084b29cf 100644 --- a/crates/iota-swarm-config/src/network_config_builder.rs +++ b/crates/iota-swarm-config/src/network_config_builder.rs @@ -67,12 +67,12 @@ pub enum ProtocolVersionsConfig { PerValidator(SupportedProtocolVersionsCallback), } -pub type StateAccumulatorV1EnabledCallback = Arc bool + Send + Sync + 'static>; +pub type StateAccumulatorEnabledCallback = Arc bool + Send + Sync + 'static>; #[derive(Clone)] pub enum StateAccumulatorV1EnabledConfig { Global(bool), - PerValidator(StateAccumulatorV1EnabledCallback), + PerValidator(StateAccumulatorEnabledCallback), } pub struct ConfigBuilder { @@ -234,7 +234,7 @@ impl ConfigBuilder { pub fn with_state_accumulator_callback( mut self, - func: StateAccumulatorV1EnabledCallback, + func: StateAccumulatorEnabledCallback, ) -> Self { self.state_accumulator_config = Some(StateAccumulatorV1EnabledConfig::PerValidator(func)); self diff --git a/crates/test-cluster/src/lib.rs b/crates/test-cluster/src/lib.rs index 7402d6bd3c3..f65967780ae 100644 --- a/crates/test-cluster/src/lib.rs +++ b/crates/test-cluster/src/lib.rs @@ -56,7 +56,7 @@ use iota_swarm_config::{ genesis_config::{AccountConfig, DEFAULT_GAS_AMOUNT, GenesisConfig, ValidatorGenesisConfig}, network_config::{NetworkConfig, NetworkConfigLight}, network_config_builder::{ - ProtocolVersionsConfig, StateAccumulatorV1EnabledCallback, StateAccumulatorV1EnabledConfig, + ProtocolVersionsConfig, StateAccumulatorEnabledCallback, StateAccumulatorV1EnabledConfig, SupportedProtocolVersionsCallback, }, node_config_builder::{FullnodeConfigBuilder, ValidatorConfigBuilder}, @@ -1190,7 +1190,7 @@ impl TestClusterBuilder { pub fn with_state_accumulator_callback( mut self, - func: StateAccumulatorV1EnabledCallback, + func: StateAccumulatorEnabledCallback, ) -> Self { self.validator_state_accumulator_config = StateAccumulatorV1EnabledConfig::PerValidator(func); From 58a796a9979d651c243162cf6d3ded5b05992998 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Thu, 24 Oct 2024 22:10:51 +0800 Subject: [PATCH 50/62] chores(iota-graphql-rpc): Update schema --- crates/iota-graphql-rpc/schema.graphql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/iota-graphql-rpc/schema.graphql b/crates/iota-graphql-rpc/schema.graphql index 9073262dd20..be787e02e22 100644 --- a/crates/iota-graphql-rpc/schema.graphql +++ b/crates/iota-graphql-rpc/schema.graphql @@ -199,7 +199,7 @@ type AuthenticatorStateExpireTransaction { """ System transaction for updating the on-chain state used by zkLogin. """ -type AuthenticatorStateUpdateV1Transaction { +type AuthenticatorStateUpdateTransaction { """ Epoch of the authenticator state update transaction. """ @@ -4194,7 +4194,7 @@ input TransactionBlockFilter { The kind of transaction block, either a programmable transaction or a system transaction. """ -union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateV1Transaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction +union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateTransaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction """ An input filter selecting for either system or programmable transactions. From 8acc8077a1665cb612e0b19f0632ac3e58d2081b Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 16:55:35 +0200 Subject: [PATCH 51/62] fix(iota-graphql-rpc): test snapshot --- .../tests/snapshots/snapshot_tests__schema_sdl_export.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap b/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap index c3bbb40923f..b8f1c96b155 100644 --- a/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap +++ b/crates/iota-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap @@ -203,7 +203,7 @@ type AuthenticatorStateExpireTransaction { """ System transaction for updating the on-chain state used by zkLogin. """ -type AuthenticatorStateUpdateV1Transaction { +type AuthenticatorStateUpdateTransaction { """ Epoch of the authenticator state update transaction. """ @@ -4198,7 +4198,7 @@ input TransactionBlockFilter { The kind of transaction block, either a programmable transaction or a system transaction. """ -union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateV1Transaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction +union TransactionBlockKind = ConsensusCommitPrologueTransaction | GenesisTransaction | ProgrammableTransactionBlock | AuthenticatorStateUpdateTransaction | RandomnessStateUpdateTransaction | EndOfEpochTransaction """ An input filter selecting for either system or programmable transactions. From 11fa65ab80781a96d838fa68a10d221d49411223 Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 17:11:01 +0200 Subject: [PATCH 52/62] fix(iota-core): update staged iota format --- crates/iota-core/tests/staged/iota.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/iota-core/tests/staged/iota.yaml b/crates/iota-core/tests/staged/iota.yaml index 5c88fd0f2d4..93612022d94 100644 --- a/crates/iota-core/tests/staged/iota.yaml +++ b/crates/iota-core/tests/staged/iota.yaml @@ -31,7 +31,7 @@ AuthenticatorStateExpire: - min_epoch: U64 - authenticator_obj_initial_shared_version: TYPENAME: SequenceNumber -AuthenticatorStateUpdate: +AuthenticatorStateUpdateV1: STRUCT: - epoch: U64 - round: U64 @@ -1007,9 +1007,9 @@ TransactionKind: NEWTYPE: TYPENAME: ConsensusCommitPrologueV1 3: - AuthenticatorStateUpdate: + AuthenticatorStateUpdateV1: NEWTYPE: - TYPENAME: AuthenticatorStateUpdate + TYPENAME: AuthenticatorStateUpdateV1 4: EndOfEpochTransaction: NEWTYPE: @@ -1062,10 +1062,10 @@ TypeTag: TypedStoreError: ENUM: 0: - RocksDBError: + RocksDB: NEWTYPE: STR 1: - SerializationError: + Serialization: NEWTYPE: STR 2: UnregisteredColumn: @@ -1075,7 +1075,7 @@ TypedStoreError: 4: MetricsReporting: UNIT 5: - RetryableTransactionError: UNIT + RetryableTransaction: UNIT UnchangedSharedKind: ENUM: 0: From d4ff63c64f0f1f9dbee104f192590b514ce195b1 Mon Sep 17 00:00:00 2001 From: miker83z Date: Thu, 24 Oct 2024 18:01:44 +0200 Subject: [PATCH 53/62] fix(msim): IotaSystemState matches + remove dead code --- .../tests/protocol_version_tests.rs | 2 +- crates/iota-genesis-builder/src/lib.rs | 9 ++++++++- crates/iota-storage/tests/key_value_tests.rs | 17 ----------------- crates/iota-types/src/iota_system_state/mod.rs | 5 +++++ 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/crates/iota-e2e-tests/tests/protocol_version_tests.rs b/crates/iota-e2e-tests/tests/protocol_version_tests.rs index cce1d74a651..2deda364079 100644 --- a/crates/iota-e2e-tests/tests/protocol_version_tests.rs +++ b/crates/iota-e2e-tests/tests/protocol_version_tests.rs @@ -991,7 +991,7 @@ mod sim_only_tests { // The system state object will be upgraded next time we execute advance_epoch // transaction at epoch boundary. let system_state = test_cluster.wait_for_epoch(Some(2)).await; - if let IotaSystemState::V2(inner) = system_state { + if let IotaSystemState::V1(inner) = system_state { assert_eq!(inner.parameters.min_validator_count, 4); } else { unreachable!("Unexpected iota system state version"); diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index f89b3bf2c5b..1a30ef45f7c 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -463,7 +463,14 @@ impl Builder { } = self.parameters.to_genesis_chain_parameters(); // In non-testing code, genesis type must always be V1. - let IotaSystemState::V1(system_state) = unsigned_genesis.iota_system_object(); + let system_state = match unsigned_genesis.iota_system_object() { + IotaSystemState::V1(inner) => inner, + #[cfg(msim)] + _ => { + // Types other than V1 used in simtests do not need to be validated. + return; + } + }; let protocol_config = get_genesis_protocol_config(ProtocolVersion::new(protocol_version)); diff --git a/crates/iota-storage/tests/key_value_tests.rs b/crates/iota-storage/tests/key_value_tests.rs index ec2eaf956c3..f71ee6e9cbb 100644 --- a/crates/iota-storage/tests/key_value_tests.rs +++ b/crates/iota-storage/tests/key_value_tests.rs @@ -446,23 +446,6 @@ mod simtests { use super::*; - async fn svc( - State(state): State>>>>, - request: Request, - ) -> Response { - let path = request.uri().path().to_string(); - let key = path.trim_start_matches('/'); - let value = state.lock().unwrap().get(key).cloned(); - info!("Got request for key: {:?}, value: {:?}", key, value); - match value { - Some(v) => Response::new(Body::from(v)), - None => Response::builder() - .status(hyper::StatusCode::NOT_FOUND) - .body(Body::empty()) - .unwrap(), - } - } - async fn test_server(data: Arc>>>) { let handle = iota_simulator::runtime::Handle::current(); let builder = handle.create_node(); diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs index e15c01a384d..bdadfcada9a 100644 --- a/crates/iota-types/src/iota_system_state/mod.rs +++ b/crates/iota-types/src/iota_system_state/mod.rs @@ -211,6 +211,11 @@ impl IotaSystemState { pub fn into_genesis_version_for_tooling(self) -> IotaSystemStateInnerGenesis { match self { IotaSystemState::V1(inner) => inner, + #[cfg(msim)] + _ => { + // Types other than V1 used in simtests should be unreachable + unreachable!() + } } } From 7d2c562ce0722c6d2524ebb8d38328e016be4776 Mon Sep 17 00:00:00 2001 From: jkrvivian Date: Fri, 25 Oct 2024 14:29:30 +0800 Subject: [PATCH 54/62] fix(iota-genesis-builder): Add clippy::infallible_destructuring_match for msim match branches --- crates/iota-genesis-builder/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/iota-genesis-builder/src/lib.rs b/crates/iota-genesis-builder/src/lib.rs index 1a30ef45f7c..27f77ebf443 100644 --- a/crates/iota-genesis-builder/src/lib.rs +++ b/crates/iota-genesis-builder/src/lib.rs @@ -463,6 +463,7 @@ impl Builder { } = self.parameters.to_genesis_chain_parameters(); // In non-testing code, genesis type must always be V1. + #[allow(clippy::infallible_destructuring_match)] let system_state = match unsigned_genesis.iota_system_object() { IotaSystemState::V1(inner) => inner, #[cfg(msim)] From ceac0731f228c2d15a44b2d636ea7a5b7ff0c429 Mon Sep 17 00:00:00 2001 From: miker83z Date: Fri, 25 Oct 2024 17:05:51 +0200 Subject: [PATCH 55/62] chore(sdk): revert changes --- sdk/graphql-transport/src/generated/queries.ts | 2 +- sdk/typescript/src/client/types/generated.ts | 12 +++++++----- .../src/graphql/generated/2024.10/schema.graphql | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sdk/graphql-transport/src/generated/queries.ts b/sdk/graphql-transport/src/generated/queries.ts index e6b402b88c8..5465b305677 100644 --- a/sdk/graphql-transport/src/generated/queries.ts +++ b/sdk/graphql-transport/src/generated/queries.ts @@ -5018,7 +5018,7 @@ export type Validator = { stakingPool?: Maybe; /** The epoch at which this pool became active. */ stakingPoolActivationEpoch?: Maybe; - /** The ID of this validator's `0x3::staking_pool::StakingPoolV1`. */ + /** The ID of this validator's `0x3::staking_pool::StakingPool`. */ stakingPoolId: Scalars['IotaAddress']['output']; /** The total number of IOTA tokens in this pool. */ stakingPoolIotaBalance?: Maybe; diff --git a/sdk/typescript/src/client/types/generated.ts b/sdk/typescript/src/client/types/generated.ts index adf84565085..002decccf4e 100644 --- a/sdk/typescript/src/client/types/generated.ts +++ b/sdk/typescript/src/client/types/generated.ts @@ -228,7 +228,7 @@ export interface EndOfEpochInfo { epochEndTimestamp: string; lastCheckpointId: string; mintedTokensAmount: string; - /** existing fields from `SystemEpochInfoEventV1` (without epoch) */ + /** existing fields from `SystemEpochInfoEvent` (without epoch) */ protocolVersion: string; referenceGasPrice: string; storageCharge: string; @@ -800,7 +800,6 @@ export type IotaTransactionBlockBuilderMode = 'Commit' | 'DevInspect'; * fields so that they are decoupled from the internal definitions. */ export interface IotaValidatorSummary { - authorityPubkeyBytes: string; commissionRate: string; description: string; /** ID of the exchange rate table object. */ @@ -813,7 +812,6 @@ export interface IotaValidatorSummary { name: string; netAddress: string; networkPubkeyBytes: string; - nextEpochAuthorityPubkeyBytes?: string | null; nextEpochCommissionRate: string; nextEpochGasPrice: string; nextEpochNetAddress?: string | null; @@ -823,6 +821,8 @@ export interface IotaValidatorSummary { nextEpochProofOfPossession?: string | null; nextEpochProtocolPubkeyBytes?: string | null; nextEpochStake: string; + nextEpochWorkerAddress?: string | null; + nextEpochWorkerPubkeyBytes?: string | null; operationCapId: string; p2pAddress: string; /** Pending pool token withdrawn during the current epoch, emptied at epoch boundaries. */ @@ -848,6 +848,8 @@ export interface IotaValidatorSummary { /** The total number of IOTA tokens in this pool. */ stakingPoolIotaBalance: string; votingPower: string; + workerAddress: string; + workerPubkeyBytes: string; } export interface MoveCallMetrics { /** The count of calls of each function in the last 30 days. */ @@ -1112,7 +1114,7 @@ export type ObjectResponseError = code: 'unknown'; } | { - code: 'display'; + code: 'displayError'; error: string; }; export interface IotaObjectResponseQuery { @@ -1479,7 +1481,7 @@ export type IotaTransactionBlockKind = } /** A transaction which updates global authenticator state */ | { epoch: string; - kind: 'AuthenticatorStateUpdateV1'; + kind: 'AuthenticatorStateUpdate'; new_active_jwks: IotaActiveJwk[]; round: string; } /** A transaction which updates global randomness state */ diff --git a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql index a280da6ce7b..4a94721baf3 100644 --- a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql +++ b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql @@ -4400,7 +4400,7 @@ type Validator { """ stakingPool: MoveObject @deprecated(reason: "The staking pool is a wrapped object. Access its fields directly on the `Validator` type.") """ - The ID of this validator's `0x3::staking_pool::StakingPoolV1`. + The ID of this validator's `0x3::staking_pool::StakingPool`. """ stakingPoolId: IotaAddress! """ From 79d2e3399d20ed5d999c8814ddd0d8f8fecab1c9 Mon Sep 17 00:00:00 2001 From: miker83z Date: Fri, 25 Oct 2024 17:39:06 +0200 Subject: [PATCH 56/62] fix(iota-graphql-e2e-tests): update baselines --- .../tests/available_range/available_range.exp | 16 +- .../tests/call/dynamic_fields.exp | 100 +-- .../tests/call/simple.exp | 62 +- .../tests/consistency/balances.exp | 40 +- .../checkpoints/transaction_blocks.exp | 36 +- .../tests/consistency/coins.exp | 276 +++---- .../consistency/dynamic_fields/deleted_df.exp | 111 +-- .../dynamic_fields/deleted_dof.exp | 18 +- .../dof_add_reclaim_transfer.exp | 20 +- .../dof_add_reclaim_transfer_reclaim_add.exp | 24 +- .../dynamic_fields/dynamic_fields.exp | 347 ++++----- .../dynamic_fields/immutable_dof.exp | 22 +- .../consistency/dynamic_fields/mutated_df.exp | 22 +- .../dynamic_fields/mutated_dof.exp | 30 +- .../consistency/dynamic_fields/nested_dof.exp | 32 +- .../consistency/epochs/transaction_blocks.exp | 216 +++--- .../tests/consistency/object_at_version.exp | 16 +- .../tests/consistency/objects_pagination.exp | 328 ++++----- .../consistency/objects_pagination_single.exp | 60 +- .../consistency/performance/many_objects.exp | 132 ++-- .../tests/consistency/staked_iota.exp | 40 +- .../tests/consistency/tx_address_objects.exp | 690 +++++++++--------- .../tests/epoch/chain_identifier.exp | 2 +- .../tests/epoch/epoch.exp | 6 +- .../tests/epoch/system_state.exp | 4 +- .../tests/errors/clever_errors.exp | 40 +- .../tests/errors/clever_errors_in_macros.exp | 6 +- .../event_connection/event_connection.exp | 24 +- .../event_connection/nested_emit_event.exp | 6 +- .../tests/event_connection/no_filter.exp | 4 +- .../tests/event_connection/pagination.exp | 18 +- .../tests/event_connection/tx_digest.exp | 10 +- .../tests/event_connection/type_filter.exp | 16 +- .../event_connection/type_param_filter.exp | 38 +- .../tests/limits/directives.exp | 4 +- .../tests/limits/output_node_estimation.exp | 26 +- .../tests/objects/coin.exp | 45 +- .../tests/objects/data.exp | 250 +++---- .../tests/objects/display.exp | 18 +- .../tests/objects/enum_data.exp | 238 +++--- .../tests/objects/filter_by_type.exp | 42 +- .../tests/objects/pagination.exp | 65 +- .../tests/objects/public_transfer.exp | 8 +- .../tests/objects/received.exp | 2 +- .../tests/objects/staked_iota.exp | 24 +- .../tests/owner/downcasts.exp | 2 +- .../tests/owner/root_version.exp | 32 +- .../tests/packages/datatypes.exp | 4 +- .../tests/packages/enums.exp | 42 +- .../tests/packages/friends.exp | 46 +- .../tests/packages/functions.exp | 38 +- .../tests/packages/modules.exp | 18 +- .../tests/packages/structs.exp | 34 +- .../tests/packages/types.exp | 2 +- .../tests/packages/versioning.exp | 64 +- .../balance_changes.exp | 14 +- .../dependencies.exp | 44 +- .../tests/transactions/at_checkpoint.exp | 12 +- .../tests/transactions/errors.exp | 4 +- .../tests/transactions/filters/kind.exp | 20 +- .../tests/transactions/programmable.exp | 170 ++--- .../tests/transactions/random.exp | 2 +- .../transactions/scan_limit/alternating.exp | 18 +- .../transactions/scan_limit/both_cursors.exp | 8 +- .../transactions/scan_limit/equal/first.exp | 24 +- .../transactions/scan_limit/equal/last.exp | 20 +- .../transactions/scan_limit/ge_page/first.exp | 20 +- .../transactions/scan_limit/ge_page/last.exp | 16 +- .../transactions/scan_limit/le_page/first.exp | 30 +- .../transactions/scan_limit/le_page/last.exp | 30 +- .../tests/transactions/scan_limit/require.exp | 82 +-- .../tests/transactions/shared.exp | 16 +- .../tests/transactions/system.exp | 333 ++++----- 73 files changed, 2215 insertions(+), 2464 deletions(-) diff --git a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp index 91a523e5192..72c268bd59b 100644 --- a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp +++ b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp @@ -6,20 +6,20 @@ Response: { "data": { "availableRange": { "first": { - "digest": "Sb7RwyYJREvie56PXLBzn5veDf351hGqoGCkJAehQa1", + "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd", "sequenceNumber": 0 }, "last": { - "digest": "Sb7RwyYJREvie56PXLBzn5veDf351hGqoGCkJAehQa1", + "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd", "sequenceNumber": 0 } }, "first": { - "digest": "Sb7RwyYJREvie56PXLBzn5veDf351hGqoGCkJAehQa1", + "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd", "sequenceNumber": 0 }, "last": { - "digest": "Sb7RwyYJREvie56PXLBzn5veDf351hGqoGCkJAehQa1", + "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd", "sequenceNumber": 0 } } @@ -39,20 +39,20 @@ Response: { "data": { "availableRange": { "first": { - "digest": "Sb7RwyYJREvie56PXLBzn5veDf351hGqoGCkJAehQa1", + "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd", "sequenceNumber": 0 }, "last": { - "digest": "GrKNuuTApsop3VvEpBpbjsQG6wxbXvdxpKfbe8zC94MW", + "digest": "3L1P3y1CaxBwfBnGUurLVuC1iMUGrsAbE4hrizUMLsV2", "sequenceNumber": 2 } }, "first": { - "digest": "Sb7RwyYJREvie56PXLBzn5veDf351hGqoGCkJAehQa1", + "digest": "DKptbXKz2pt5EXvcnVmbuGjqCGx7B7iiEw4D4kbiafsd", "sequenceNumber": 0 }, "last": { - "digest": "GrKNuuTApsop3VvEpBpbjsQG6wxbXvdxpKfbe8zC94MW", + "digest": "3L1P3y1CaxBwfBnGUurLVuC1iMUGrsAbE4hrizUMLsV2", "sequenceNumber": 2 } } diff --git a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp index 15dcf621387..ac5febe53b2 100644 --- a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp +++ b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp @@ -41,12 +41,12 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "bool" }, "data": { - "Number": "0" + "Bool": false }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { "__typename": "MoveValue" @@ -55,40 +55,40 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { - "__typename": "MoveObject" + "__typename": "MoveValue" } }, { "name": { "type": { - "repr": "vector" + "repr": "u64" }, "data": { - "Vector": [] + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { - "__typename": "MoveValue" + "__typename": "MoveObject" } }, { "name": { "type": { - "repr": "bool" + "repr": "u64" }, "data": { - "Bool": false + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { "__typename": "MoveValue" @@ -121,12 +121,12 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "bool" }, "data": { - "Number": "0" + "Bool": false }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { "__typename": "MoveValue" @@ -135,40 +135,40 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { - "__typename": "MoveObject" + "__typename": "MoveValue" } }, { "name": { "type": { - "repr": "vector" + "repr": "u64" }, "data": { - "Vector": [] + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { - "__typename": "MoveValue" + "__typename": "MoveObject" } }, { "name": { "type": { - "repr": "bool" + "repr": "u64" }, "data": { - "Bool": false + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { "__typename": "MoveValue" @@ -190,17 +190,17 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "bool" }, "data": { - "Number": "0" + "Bool": false }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { - "bcs": "AAAAAAAAAAA=", + "bcs": "AgAAAAAAAAA=", "data": { - "Number": "0" + "Number": "2" }, "__typename": "MoveValue" } @@ -208,49 +208,49 @@ Response: { { "name": { "type": { - "repr": "u64" + "repr": "vector" }, "data": { - "Number": "0" + "Vector": [] }, - "bcs": "AAAAAAAAAAA=" + "bcs": "AA==" }, "value": { - "__typename": "MoveObject" + "bcs": "AQAAAAAAAAA=", + "data": { + "Number": "1" + }, + "__typename": "MoveValue" } }, { "name": { "type": { - "repr": "vector" + "repr": "u64" }, "data": { - "Vector": [] + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { - "bcs": "AQAAAAAAAAA=", - "data": { - "Number": "1" - }, - "__typename": "MoveValue" + "__typename": "MoveObject" } }, { "name": { "type": { - "repr": "bool" + "repr": "u64" }, "data": { - "Bool": false + "Number": "0" }, - "bcs": "AA==" + "bcs": "AAAAAAAAAAA=" }, "value": { - "bcs": "AgAAAAAAAAA=", + "bcs": "AAAAAAAAAAA=", "data": { - "Number": "2" + "Number": "0" }, "__typename": "MoveValue" } diff --git a/crates/iota-graphql-e2e-tests/tests/call/simple.exp b/crates/iota-graphql-e2e-tests/tests/call/simple.exp index 7e772c87857..79734bb008c 100644 --- a/crates/iota-graphql-e2e-tests/tests/call/simple.exp +++ b/crates/iota-graphql-e2e-tests/tests/call/simple.exp @@ -25,13 +25,15 @@ task 4, line 32: //# view-object 0,0 Owner: Account Address ( validator_0 ) Version: 1 -Contents: iota_system::validator_cap::UnverifiedValidatorOperationCap { +Contents: iota::coin::Coin { id: iota::object::UID { id: iota::object::ID { bytes: fake(0,0), }, }, - authorizer_validator_address: validator_0, + balance: iota::balance::Balance { + value: 30000000000000000u64, + }, } task 5, line 34: @@ -75,7 +77,7 @@ Epoch advanced: 5 task 10, line 44: //# view-checkpoint -CheckpointSummary { epoch: 5, seq: 10, content_digest: 9X2eEhaTREKQbXGbHrnnmvTm4TZfhhY5H6rUcecft8bX, +CheckpointSummary { epoch: 5, seq: 10, content_digest: 8C7boJBvJAis4x87RcLdUwsotz5nszRSDKNqwSRBrJ2X, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 0, storage_cost: 0, storage_rebate: 0, non_refundable_storage_fee: 0 }} task 11, lines 46-51: @@ -153,8 +155,8 @@ Response: { "edges": [ { "node": { - "address": "0x6273faa79d73a191d238a3bdcc2b3c11eb976980b296d22d410f95c0f61d2fde", - "digest": "121p5YAKxtozkekSFdYPAoFpViqUnAztxspya851dx9M", + "address": "0xc2e5075e25108da183a2ba97812d32c6d0a4793ec67bc5db94d90047a0f70a3d", + "digest": "AFarGPHjHVA9txUxCPKeoZtESimtPcN3nymwVYYWwBwJ", "owner": { "__typename": "AddressOwner" } @@ -180,8 +182,8 @@ Response: { "edges": [ { "node": { - "address": "0x6273faa79d73a191d238a3bdcc2b3c11eb976980b296d22d410f95c0f61d2fde", - "digest": "121p5YAKxtozkekSFdYPAoFpViqUnAztxspya851dx9M", + "address": "0xc2e5075e25108da183a2ba97812d32c6d0a4793ec67bc5db94d90047a0f70a3d", + "digest": "AFarGPHjHVA9txUxCPKeoZtESimtPcN3nymwVYYWwBwJ", "owner": { "__typename": "AddressOwner" } @@ -195,8 +197,8 @@ Response: { "edges": [ { "node": { - "address": "0x0aa69d72003801ab057e567938016c0f832f1516937fc84a8b5c11ba06c06815", - "digest": "8NvJsVTkKKDJgavep2F65Aff6gJmdWpxJJ7Hpe1dTZ7e", + "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2", + "digest": "3gSuJbZMZS3HxsjwJqf1mmxmuqJJ97DYD1HEmahVJwhH", "owner": { "__typename": "AddressOwner" } @@ -204,8 +206,8 @@ Response: { }, { "node": { - "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2", - "digest": "qm9zxqHuMpn3adTZR7Hw4kx2E5cAApBrNZcCYMTj4q4", + "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31", + "digest": "9qvFEYrKWnQKp7pVwQwgRs4wr1JpUYjQG4rUT631cXzh", "owner": { "__typename": "AddressOwner" } @@ -213,8 +215,8 @@ Response: { }, { "node": { - "address": "0x31e3256cfe19704fd29c7e8a8d0030b2d6101b8c04668ead7bf7d38257d9e002", - "digest": "FXQKdY2oYvWnDGs3L2EuPYSYupHC8yhcsWBTtGP12DBr", + "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461", + "digest": "9N3zxpXit5LCm3V9rbBxH4z1UBRw9ra1gdzwDW9aHs3i", "owner": { "__typename": "AddressOwner" } @@ -222,8 +224,8 @@ Response: { }, { "node": { - "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31", - "digest": "GuVwJJNsKJwzmufHJCmPMW27fYZf2JNS2SNT3gi1XSgj", + "address": "0x5d9ebd2a8afda720f1e14510e836f0a7f2d06721edbe2dc17f1da09f8e041102", + "digest": "BiyEUGtqjGUiTvS4cGqdEmY2Nux8PDRN92DixGRjjKav", "owner": { "__typename": "AddressOwner" } @@ -231,8 +233,8 @@ Response: { }, { "node": { - "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461", - "digest": "abMq2H3FqVggiupt3CknW1YNEKFZdYGTZNu7XpU7YsX", + "address": "0x631e1039ece5a1cfba91d8cacc6db672855259d30f4a9f26f6f9fa27779579a3", + "digest": "D8nTeQxbVWB5T6e7aUeFEkeg1YMt9joWfGhdHArfR9KD", "owner": { "__typename": "AddressOwner" } @@ -240,8 +242,8 @@ Response: { }, { "node": { - "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97", - "digest": "HpzDcE6Fz6Nbk1KNhY1c1qU5QxCAaHXzFA1hfYfhFMHz", + "address": "0x6793f0b1d3e3dc874b493df636a05bf09df73c97e0d796c2bac680e91b6e9fbd", + "digest": "FUn7hApxv3ufm1oZPg6JWsLKT8N8oKbZftDzTvqPXDZd", "owner": { "__typename": "AddressOwner" } @@ -249,8 +251,8 @@ Response: { }, { "node": { - "address": "0x892836945e37c3a48c0dde074d3a079a50dfc47c1fbde03d7409064340b1f743", - "digest": "6saYWQXDNUMksgPTxBkir1ZHoh6L6A1sXJ14CTTTPLkx", + "address": "0x7a5b205a60f96c06d4022771144ab858b04002a51918285efa6002f9533326e3", + "digest": "69sGWwst8WwiRh5Ne8cwC9LS1dYFoWUf6y1vLsszLccr", "owner": { "__typename": "AddressOwner" } @@ -258,8 +260,8 @@ Response: { }, { "node": { - "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056", - "digest": "844BRJc3iC63fki2xFCUuVwTJead6GqviJHFvgGmxyj5", + "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97", + "digest": "H2hX9mXEsdhvE3JB5js15D37uMthdFiTiL8DMcFrXnKZ", "owner": { "__typename": "AddressOwner" } @@ -267,8 +269,8 @@ Response: { }, { "node": { - "address": "0xab2415a43bf8f72193ec765f63af9cf7705bb3a312b0a14f1332be3f74d81c58", - "digest": "6p1wpzeYh47gcC9FC22Po8N1wCHMEyaZJwB4QzLRdcFo", + "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056", + "digest": "GnUXZGtU8tSukrAnZs8s3uLPJQbDGbU9LNLhQHWzodDw", "owner": { "__typename": "AddressOwner" } @@ -277,7 +279,7 @@ Response: { { "node": { "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d", - "digest": "35hWuW17ahJAyBFSWHZH2f8LNNDTF4mVT362X7FSyhJ6", + "digest": "9bFmqesBC3jaAcnXiFcuhrp5JJXKo76RShWxKuYBEepy", "owner": { "__typename": "AddressOwner" } @@ -285,8 +287,8 @@ Response: { }, { "node": { - "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8", - "digest": "HRC6wHwgsx4WmFhWVAJSDAMMAFoVZtGKSWrv78QDrzxn", + "address": "0xaed211bdefe57090cd0f243a9c4b3c4c0f7838304362250da740665cca37de18", + "digest": "35iGwEYbKF8QURtt7poLvhP4gvYdnNsGg2VZ7fSAGBrB", "owner": { "__typename": "AddressOwner" } @@ -294,8 +296,8 @@ Response: { }, { "node": { - "address": "0xfb29acaee47f4cf6dfd7d21773f74fb65f842e9483b194b06bf83f91c0460bf3", - "digest": "CsCUE4uQeGjvUMAAFkh1sh2rfLfLdBXJHy7aBv1TfuPo", + "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8", + "digest": "D5fLc9Yevxrr2SKRFZsM43zLXG4vuH3VGdXwGdx5ScaT", "owner": { "__typename": "AddressOwner" } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp index cd7e0694d83..7bb6a6e629c 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp @@ -80,7 +80,7 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "700" @@ -103,7 +103,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "500" + "totalBalance": "600" }, "allBalances": { "nodes": [ @@ -116,10 +116,10 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 2, - "totalBalance": "500" + "totalBalance": "600" } ] } @@ -139,7 +139,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "200" + "totalBalance": "300" }, "allBalances": { "nodes": [ @@ -152,10 +152,10 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 1, - "totalBalance": "200" + "totalBalance": "300" } ] } @@ -196,7 +196,7 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "700" @@ -219,7 +219,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "500" + "totalBalance": "600" }, "allBalances": { "nodes": [ @@ -232,10 +232,10 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 2, - "totalBalance": "500" + "totalBalance": "600" } ] } @@ -255,7 +255,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "200" + "totalBalance": "300" }, "allBalances": { "nodes": [ @@ -268,10 +268,10 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 1, - "totalBalance": "200" + "totalBalance": "300" } ] } @@ -334,7 +334,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "500" + "totalBalance": "600" }, "allBalances": { "nodes": [ @@ -347,10 +347,10 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 2, - "totalBalance": "500" + "totalBalance": "600" } ] } @@ -370,7 +370,7 @@ Response: { { "sender": { "fakeCoinBalance": { - "totalBalance": "200" + "totalBalance": "300" }, "allBalances": { "nodes": [ @@ -383,10 +383,10 @@ Response: { }, { "coinType": { - "repr": "0xe8ee7be6dbe0973ef635dc6515beaa862a9597be976c26dbaf1034e593b3c85f::fake::FAKE" + "repr": "0x84f9be4b6e49b87bb7eb2f2e16298b7c8e1a2d60fdd9730e32405b7b46a5df70::fake::FAKE" }, "coinObjectCount": 1, - "totalBalance": "200" + "totalBalance": "300" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp index f652aea58ac..7cf21dbc53d 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp @@ -94,12 +94,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD", + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -109,12 +109,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "5Fx8EKmMoiHb59rVr2ch64EgLyvs9SWhuUHq6x3HAx3T", + "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -124,12 +124,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "DvNBuuqGugb9p76oMb1jLa6MdAv7mT184x69bGKC2rQw", + "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -139,12 +139,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k", + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -161,12 +161,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "2uLirA5sxREeS1UHEKCJWeoMv2R1MKCUiiep9Q6s7WA6", + "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -176,12 +176,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "4HgxdMoiQdZbLrd7ycQ3csPtccNPvr9BZW67ykV7NRk6", + "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -191,12 +191,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "d9yohmp3svrBRKZjbfv7Gn5TbCrmspbqis2wy76ES1M", + "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -213,12 +213,12 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "ExuPheKtkWpsGKjy7HuYFUWjsGqftVXNXyyu8XQUjro5", + "digest": "2RUSFSVNTC7FniEbnzm3g97tp3hbypt5GGWmJGFPnmDV", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } @@ -228,12 +228,12 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "GFdCwVbseLpFVe3sX91EkkAHJm2hXXVM3LH4FZu1gn9K", + "digest": "3E7sv74JFwPZziRo1JykjSBZ6TG2FNGZGdTqRwbWSust", "sender": { "objects": { "edges": [ { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2AwAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSAwAAAAAAAAA=" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp index 6a8b307ea47..b5156d37581 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp @@ -33,7 +33,7 @@ Response: { "queryCoinsAtLatest": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAgAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -41,39 +41,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAgAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AgAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAgAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -85,16 +85,16 @@ Response: { }, "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AgAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -102,39 +102,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAgAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AgAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAgAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -146,16 +146,16 @@ Response: { }, "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAgAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -163,39 +163,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAgAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AgAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAgAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -207,9 +207,9 @@ Response: { }, "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -221,39 +221,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAgAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AgAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAgAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAgAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -272,7 +272,7 @@ Response: { "queryCoinsAtChkpt1": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -280,39 +280,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAQAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -324,16 +324,16 @@ Response: { }, "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -341,39 +341,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAQAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -385,9 +385,9 @@ Response: { }, "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } @@ -399,26 +399,26 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } @@ -453,7 +453,7 @@ Response: { "queryCoins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAwAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -461,13 +461,13 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAwAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } @@ -479,16 +479,16 @@ Response: { }, "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AwAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -496,26 +496,26 @@ Response: { "coins": { "edges": [ { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AwAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAwAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -527,16 +527,16 @@ Response: { }, "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAwAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=", "node": { "owner": { "owner": { @@ -544,26 +544,26 @@ Response: { "coins": { "edges": [ { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AwAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAwAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -575,9 +575,9 @@ Response: { }, "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -589,13 +589,13 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAwAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100100" + "value": "100200" } } } @@ -608,26 +608,26 @@ Response: { "coins": { "edges": [ { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AwAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAwAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAwAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -658,7 +658,7 @@ Response: { "queryCoinsAtChkpt1BeforeSnapshotCatchup": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -666,39 +666,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAQAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -710,16 +710,16 @@ Response: { }, "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "consistentStateForEachCoin": { "owner": { @@ -727,39 +727,39 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } } }, { - "cursor": "IOtyLmahCDl5xXyOjB0WMqX9cUF4/ZkicypBnpx9OxxlAQAAAAAAAAA=", + "cursor": "IPj4cRR2GNmdRMDkAa374gC9VjY1lCd4DFcmTQZIYn+eAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xeb722e66a1083979c57c8e8c1d1632a5fd714178fd9922732a419e9c7d3b1c65", + "id": "0xf8f871147618d99d44c0e401adfbe200bd5636359427780c57264d0648627f9e", "balance": { - "value": "200" + "value": "300" } } } @@ -771,9 +771,9 @@ Response: { }, "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } @@ -785,26 +785,26 @@ Response: { "coins": { "edges": [ { - "cursor": "ICiav5I6Mkx08X0VmoZKIJ0awF2KpVcGFefQ4GWueq9jAQAAAAAAAAA=", + "cursor": "INF4y6RgI+x6+uilTvYHZ19okSbPHT/Td7qiwWLoply5AQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0x289abf923a324c74f17d159a864a209d1ac05d8aa5570615e7d0e065ae7aaf63", + "id": "0xd178cba46023ec7afae8a54ef607675f689126cf1d3fd377baa2c162e8a65cb9", "balance": { - "value": "100" + "value": "200" } } } } }, { - "cursor": "IKQYR4gBIlqmEkXHMhZsUUbfKoX8aufbPgILwCO/Sly9AQAAAAAAAAA=", + "cursor": "IOfJiINYZ0h4ktDswip1pPKO10xxW2+MxPXoCXaG0jjHAQAAAAAAAAA=", "node": { "contents": { "json": { - "id": "0xa418478801225aa61245c732166c5146df2a85fc6ae7db3e020bc023bf4a5cbd", + "id": "0xe7c988835867487892d0ecc22a75a4f28ed74c715b6f8cc4f5e8097686d238c7", "balance": { - "value": "200" + "value": "100" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp index 992e8f5a09e..59f391792b2 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp @@ -90,18 +90,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "ILE7Qmd7Si0bo8DRAwOOkkUjscgq8eMVSXbKUzme5ggeAQAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmNA==" - }, - "value": { - "json": "df4" - } - } - }, - { - "cursor": "IMHYTm10WoA1BA2R7UWStxDRk7fLxO3XggS9/gg+DuYyAQAAAAAAAAA=", + "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNQ==" @@ -112,24 +101,24 @@ Response: { } }, { - "cursor": "IMJls0MmMIcWpo4E20v0gGl+nU2SuOa7XQC7CUalmNBAAQAAAAAAAAA=", + "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNA==" }, "value": { - "json": "df6" + "json": "df4" } } }, { - "cursor": "IPJwx5C9w7uqrDrMEb/voYfVpqNzNsYN8K1+0I6g1Mi8AQAAAAAAAAA=", + "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNg==" }, "value": { - "json": "df5" + "json": "df6" } } } @@ -150,18 +139,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "ILE7Qmd7Si0bo8DRAwOOkkUjscgq8eMVSXbKUzme5ggeAQAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmNA==" - }, - "value": { - "json": "df4" - } - } - }, - { - "cursor": "IMHYTm10WoA1BA2R7UWStxDRk7fLxO3XggS9/gg+DuYyAQAAAAAAAAA=", + "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNQ==" @@ -172,24 +150,24 @@ Response: { } }, { - "cursor": "IMJls0MmMIcWpo4E20v0gGl+nU2SuOa7XQC7CUalmNBAAQAAAAAAAAA=", + "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNA==" }, "value": { - "json": "df6" + "json": "df4" } } }, { - "cursor": "IPJwx5C9w7uqrDrMEb/voYfVpqNzNsYN8K1+0I6g1Mi8AQAAAAAAAAA=", + "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNg==" }, "value": { - "json": "df5" + "json": "df6" } } } @@ -210,68 +188,68 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IBo1+VVeBsyCYwlrL1rN5BnZ7NRXWHrkSr/9qc3pWXB9AQAAAAAAAAA=", + "cursor": "IBXEM7sfiif6smxgIJmBWkxMn6US7z34TC/rW+NOXQmaAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==" + "bcs": "A2RmMg==" }, "value": { - "json": "df1" + "json": "df2" } } }, { - "cursor": "IGcVjRUu7AcPIf24HKtfNKvbs8lG09f8hVDphXh1jGCBAQAAAAAAAAA=", + "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==" + "bcs": "A2RmNQ==" }, "value": { - "json": "df3" + "json": "df5" } } }, { - "cursor": "IItF7aouV9DuiVuj+BMc52TG4SkgwY62esLSW5q6c8fWAQAAAAAAAAA=", + "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmNA==" }, "value": { - "json": "df2" + "json": "df4" } } }, { - "cursor": "ILE7Qmd7Si0bo8DRAwOOkkUjscgq8eMVSXbKUzme5ggeAQAAAAAAAAA=", + "cursor": "IIKVY5ECiDNemkTq/lVCwzDt44fZpeAIK+iQ+EcwQygTAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==" + "bcs": "A2RmMw==" }, "value": { - "json": "df4" + "json": "df3" } } }, { - "cursor": "IMHYTm10WoA1BA2R7UWStxDRk7fLxO3XggS9/gg+DuYyAQAAAAAAAAA=", + "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNg==" }, "value": { - "json": "df5" + "json": "df6" } } }, { - "cursor": "IMJls0MmMIcWpo4E20v0gGl+nU2SuOa7XQC7CUalmNBAAQAAAAAAAAA=", + "cursor": "INUppr40jINpPev9/A4UIbKtREBWW8h1nMw6NQk1U8xnAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmMQ==" }, "value": { - "json": "df6" + "json": "df1" } } } @@ -305,18 +283,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "ILE7Qmd7Si0bo8DRAwOOkkUjscgq8eMVSXbKUzme5ggeAQAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmNA==" - }, - "value": { - "json": "df4" - } - } - }, - { - "cursor": "IMHYTm10WoA1BA2R7UWStxDRk7fLxO3XggS9/gg+DuYyAQAAAAAAAAA=", + "cursor": "IFeBXm4vjap9M5dVNXzXVaTHhuhTRg2+xYogFuZZLxPuAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNQ==" @@ -327,24 +294,24 @@ Response: { } }, { - "cursor": "IMJls0MmMIcWpo4E20v0gGl+nU2SuOa7XQC7CUalmNBAAQAAAAAAAAA=", + "cursor": "IH8ALtE7vSZE3UtPP9JRPluBoy8YqFRWE3q+E/oWrlCkAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==" + "bcs": "A2RmNA==" }, "value": { - "json": "df6" + "json": "df4" } } }, { - "cursor": "IPJwx5C9w7uqrDrMEb/voYfVpqNzNsYN8K1+0I6g1Mi8AQAAAAAAAAA=", + "cursor": "II67/lXdHT9zp83rSD1Zh3kBQnXOJcQpHN4ARyucBl77AQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNQ==" + "bcs": "A2RmNg==" }, "value": { - "json": "df5" + "json": "df6" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp index dd9eaa4fe1a..522210a7f7b 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp @@ -41,7 +41,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IOYgMJlQDDjMXCaBVDpLjGXJTNsBdDTHqO6C5QElBkZ8AQAAAAAAAAA=", + "cursor": "IHwP9laGJmLOj7bHnxSoHMm/rKzHL1L8QMdX0Ybot758AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -49,7 +49,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8ea9cbcf863a9cd6cc23a403d7de8eca3e72289bae85a75efa7cb1fe8d0bf5cd", + "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223", "count": "0" } } @@ -65,7 +65,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8ea9cbcf863a9cd6cc23a403d7de8eca3e72289bae85a75efa7cb1fe8d0bf5cd", + "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223", "count": "0" } } @@ -77,7 +77,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IOYgMJlQDDjMXCaBVDpLjGXJTNsBdDTHqO6C5QElBkZ8AQAAAAAAAAA=", + "cursor": "IHwP9laGJmLOj7bHnxSoHMm/rKzHL1L8QMdX0Ybot758AQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8ea9cbcf863a9cd6cc23a403d7de8eca3e72289bae85a75efa7cb1fe8d0bf5cd", + "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223", "count": "0" } } @@ -101,7 +101,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8ea9cbcf863a9cd6cc23a403d7de8eca3e72289bae85a75efa7cb1fe8d0bf5cd", + "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223", "count": "0" } } @@ -117,7 +117,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8ea9cbcf863a9cd6cc23a403d7de8eca3e72289bae85a75efa7cb1fe8d0bf5cd", + "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223", "count": "0" } } @@ -168,7 +168,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8ea9cbcf863a9cd6cc23a403d7de8eca3e72289bae85a75efa7cb1fe8d0bf5cd", + "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223", "count": "0" } } @@ -222,7 +222,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8ea9cbcf863a9cd6cc23a403d7de8eca3e72289bae85a75efa7cb1fe8d0bf5cd", + "id": "0x43b69600797ba3a965c53835303ba49f52dfc23dc93a634cd2954a50a45fd223", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp index 49ec6c8ff7f..1132de246a4 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp @@ -36,7 +36,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IEpbq/BIsDWp1KcUACgk+IAa4fDSSNBFUCIuxhKoAf3SAQAAAAAAAAA=", + "cursor": "IHXw7HKd1+5wVviB/aZV3hOHElzvVHueTKMKQQ7bL6+bAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -44,7 +44,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9afdb581d3012f103c984391f1aa9e6c7bfe996cf8a4736a2f55eea644c3ad8a", + "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9", "count": "0" } } @@ -60,7 +60,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9afdb581d3012f103c984391f1aa9e6c7bfe996cf8a4736a2f55eea644c3ad8a", + "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9", "count": "0" } } @@ -71,7 +71,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IEpbq/BIsDWp1KcUACgk+IAa4fDSSNBFUCIuxhKoAf3SAQAAAAAAAAA=", + "cursor": "IHXw7HKd1+5wVviB/aZV3hOHElzvVHueTKMKQQ7bL6+bAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -79,7 +79,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9afdb581d3012f103c984391f1aa9e6c7bfe996cf8a4736a2f55eea644c3ad8a", + "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9", "count": "0" } } @@ -95,7 +95,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9afdb581d3012f103c984391f1aa9e6c7bfe996cf8a4736a2f55eea644c3ad8a", + "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9", "count": "0" } } @@ -107,7 +107,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IEpbq/BIsDWp1KcUACgk+IAa4fDSSNBFUCIuxhKoAf3SAQAAAAAAAAA=", + "cursor": "IHXw7HKd1+5wVviB/aZV3hOHElzvVHueTKMKQQ7bL6+bAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -115,7 +115,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9afdb581d3012f103c984391f1aa9e6c7bfe996cf8a4736a2f55eea644c3ad8a", + "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9", "count": "0" } } @@ -131,7 +131,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9afdb581d3012f103c984391f1aa9e6c7bfe996cf8a4736a2f55eea644c3ad8a", + "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9", "count": "0" } } @@ -184,7 +184,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x9afdb581d3012f103c984391f1aa9e6c7bfe996cf8a4736a2f55eea644c3ad8a", + "id": "0x59ec032f03280718a543022037bfc541b929e2163fb01bfb3375e91e07dd46b9", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp index 1615ab1847f..ba1d2bc19e7 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp @@ -61,7 +61,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IGwYH5v+7AWkcui2XgICiCBJE0IV0cDJpSvHs1P/j6uOAQAAAAAAAAA=", + "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -69,7 +69,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } @@ -96,7 +96,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IGwYH5v+7AWkcui2XgICiCBJE0IV0cDJpSvHs1P/j6uOAQAAAAAAAAA=", + "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -104,7 +104,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } @@ -120,7 +120,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } @@ -139,7 +139,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IGwYH5v+7AWkcui2XgICiCBJE0IV0cDJpSvHs1P/j6uOAQAAAAAAAAA=", + "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -147,7 +147,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } @@ -163,7 +163,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } @@ -182,7 +182,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IGwYH5v+7AWkcui2XgICiCBJE0IV0cDJpSvHs1P/j6uOAQAAAAAAAAA=", + "cursor": "IFqAyNNcnwwa40SuWqyr9JjpRb1PDilkP9QiOeS0oCqcAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -190,7 +190,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } @@ -206,7 +206,7 @@ Response: { "value": { "contents": { "json": { - "id": "0xceba7e0eb5c3dcfa4567dc4c3b19ef8c030e769cfce310fa6178a65bb3938d2e", + "id": "0x3093e81d81c56c6e05a9edd08d214d88d955cf22c93fc61fd8798486763f25c9", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp index 106ee69ef65..fdcd9547df5 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp @@ -84,7 +84,7 @@ task 9, lines 103-165: Response: { "data": { "parent_version_2_no_dof": { - "address": "0xe81d1d628bb5942e563dc3ca652f41dfbe6a7ad11ca866249bafe4e29609f077", + "address": "0x01b231aeb199e96f501fb02e027a6436108904302fd085ccdddf78eb880149d0", "dynamicFields": { "edges": [] } @@ -93,7 +93,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJAQAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAQAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -104,7 +104,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "1" } } @@ -115,13 +115,13 @@ Response: { } }, "child_version_2_no_parent": { - "address": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "address": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "owner": {} }, "child_version_3_has_parent": { "owner": { "parent": { - "address": "0x191f969afffd2fab2dcc2c7fd06b4142e838251d1768338690e55a72eff5dbc9" + "address": "0x53033762c1ef1e0ede2da1f858ef77910e8bd8581969aecb4c28681388f627a2" } } } @@ -173,21 +173,21 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IALh6Gmj1i0tlaFppLIbcxwvTEoesuYprwx6kb++hQptAgAAAAAAAAA=", + "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df1" } } }, { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJAgAAAAAAAAA=", + "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkAgAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMg==", @@ -196,45 +196,51 @@ Response: { } }, "value": { - "contents": { - "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", - "count": "2" - } - } + "json": "df2" } } }, { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqAgAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df2" + "contents": { + "json": { + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", + "count": "2" + } + } } } }, { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiAgAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } - }, + } + ] + } + }, + "parent_version_3_only_dof": { + "dynamicFields": { + "edges": [ { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJAgAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAgAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -245,7 +251,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "1" } } @@ -264,30 +270,16 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiAgAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } } @@ -322,7 +314,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "1" } } @@ -341,7 +333,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "2" } } @@ -406,63 +398,63 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IALh6Gmj1i0tlaFppLIbcxwvTEoesuYprwx6kb++hQptAwAAAAAAAAA=", + "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df1" } } }, { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJAwAAAAAAAAA=", + "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkAwAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMg==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", - "count": "2" - } - } + "json": "df2" } } }, { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqAwAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df2" + "contents": { + "json": { + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", + "count": "2" + } + } } } }, { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiAwAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } } @@ -470,29 +462,30 @@ Response: { } }, "parent_version_4_paginated_on_dof_consistent": { - "dynamicFields": { - "edges": [] - } - }, - "parent_version_5_has_7_children": { "dynamicFields": { "edges": [ { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqAgAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df2" + "json": "df3" } } - }, + } + ] + } + }, + "parent_version_5_has_7_children": { + "dynamicFields": { + "edges": [ { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiAgAAAAAAAAA=", + "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIAwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMQ==", @@ -506,21 +499,21 @@ Response: { } }, { - "cursor": "IALh6Gmj1i0tlaFppLIbcxwvTEoesuYprwx6kb++hQptAwAAAAAAAAA=", + "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMg==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df2" } } }, { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJAwAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiAwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -531,7 +524,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "2" } } @@ -539,21 +532,7 @@ Response: { } }, { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqAwAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "IJj9WTOaH4fXBwaq2+79tcdTWMlsLD90tAA99wRYadaKAwAAAAAAAAA=", + "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9AwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -567,35 +546,35 @@ Response: { } }, { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiAwAAAAAAAAA=", + "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df4" } } }, { - "cursor": "IMg/FO6gjiPZmCvmjnU/nAaf/yi6/pDjjfvGVfr/lqXOAwAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df3" } } }, { - "cursor": "IN3UrBmzuomvuVn80suIIpOScrO99xrN0GJX752WrurUAwAAAAAAAAA=", + "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaAwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNQ==", @@ -615,21 +594,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqAwAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "IJj9WTOaH4fXBwaq2+79tcdTWMlsLD90tAA99wRYadaKAwAAAAAAAAA=", + "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9AwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -643,44 +608,44 @@ Response: { } }, { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiAwAAAAAAAAA=", + "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNg==", + "bcs": "A2RmNA==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df6" + "json": "df4" } } }, { - "cursor": "IMg/FO6gjiPZmCvmjnU/nAaf/yi6/pDjjfvGVfr/lqXOAwAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df3" } } }, { - "cursor": "IN3UrBmzuomvuVn80suIIpOScrO99xrN0GJX752WrurUAwAAAAAAAAA=", + "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaAwAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df5" } } } @@ -734,63 +699,63 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IALh6Gmj1i0tlaFppLIbcxwvTEoesuYprwx6kb++hQptBAAAAAAAAAA=", + "cursor": "IClawurZkDgT+lOfghnjBHn+PLUx66DXjrgRHFWlMokIBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMw==", + "bcs": "A2RmMQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df3" + "json": "df1" } } }, { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJBAAAAAAAAAA=", + "cursor": "IEka7584A4U5vrD9MH0Sfiqot3d9S1fFF1xTWGGMOaEkBAAAAAAAAAA=", "node": { "name": { - "bcs": "pAEAAAAAAAA=", + "bcs": "A2RmMg==", "type": { - "repr": "u64" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "contents": { - "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", - "count": "2" - } - } + "json": "df2" } } }, { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqBAAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==", + "bcs": "pAEAAAAAAAA=", "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" + "repr": "u64" } }, "value": { - "json": "df2" + "contents": { + "json": { + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", + "count": "2" + } + } } } }, { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiBAAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } } @@ -801,30 +766,16 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDoFKasvO3uRG36i8kDIIFwQcloILQn2wF4PAQIcTwYqAgAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmMg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df2" - } - } - }, - { - "cursor": "ILZJDhqQtyqtQ07tnHozoq0BbJmXlZQypzZ+hHp3ZIBiAgAAAAAAAAA=", + "cursor": "INdxBwgkvilBjMxtXP7iG+Ca5Fbl3XI1QmiAEWPxneVGAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMQ==", + "bcs": "A2RmMw==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df1" + "json": "df3" } } } @@ -835,7 +786,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJBAAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBAAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -846,7 +797,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "2" } } @@ -854,7 +805,7 @@ Response: { } }, { - "cursor": "IJj9WTOaH4fXBwaq2+79tcdTWMlsLD90tAA99wRYadaKBAAAAAAAAAA=", + "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -868,7 +819,7 @@ Response: { } }, { - "cursor": "IMg/FO6gjiPZmCvmjnU/nAaf/yi6/pDjjfvGVfr/lqXOBAAAAAAAAAA=", + "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNA==", @@ -882,7 +833,7 @@ Response: { } }, { - "cursor": "IN3UrBmzuomvuVn80suIIpOScrO99xrN0GJX752WrurUBAAAAAAAAAA=", + "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNQ==", @@ -891,7 +842,7 @@ Response: { } }, "value": { - "json": "df4" + "json": "df5" } } } @@ -902,7 +853,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJj9WTOaH4fXBwaq2+79tcdTWMlsLD90tAA99wRYadaKBAAAAAAAAAA=", + "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -916,7 +867,7 @@ Response: { } }, { - "cursor": "IMg/FO6gjiPZmCvmjnU/nAaf/yi6/pDjjfvGVfr/lqXOBAAAAAAAAAA=", + "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNA==", @@ -930,30 +881,16 @@ Response: { } }, { - "cursor": "IN3UrBmzuomvuVn80suIIpOScrO99xrN0GJX752WrurUBAAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmNg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df6" - } - } - }, - { - "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECBAAAAAAAAAA=", + "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df5" } } } @@ -1010,7 +947,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJBwAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -1021,7 +958,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "2" } } @@ -1036,7 +973,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IBkflpr//S+rLcwsf9BrQULoOCUdF2gzhpDlWnLv9dvJBwAAAAAAAAA=", + "cursor": "IFMDN2LB7x4O3i2h+Fjvd5EOi9hYGWmuy0woaBOI9ieiBwAAAAAAAAA=", "node": { "name": { "bcs": "pAEAAAAAAAA=", @@ -1047,7 +984,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x8e27ff5a173340bddbd8bcf1483a31f4dba5e4387006bf283a9cfdfffebefb60", + "id": "0x3afad17106d68ef22cc302d2bcf243767b6d23c4b0455bab226cf42dab534a6b", "count": "2" } } @@ -1055,7 +992,7 @@ Response: { } }, { - "cursor": "IJj9WTOaH4fXBwaq2+79tcdTWMlsLD90tAA99wRYadaKBwAAAAAAAAA=", + "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -1069,7 +1006,7 @@ Response: { } }, { - "cursor": "IMg/FO6gjiPZmCvmjnU/nAaf/yi6/pDjjfvGVfr/lqXOBwAAAAAAAAA=", + "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNA==", @@ -1083,7 +1020,7 @@ Response: { } }, { - "cursor": "IN3UrBmzuomvuVn80suIIpOScrO99xrN0GJX752WrurUBwAAAAAAAAA=", + "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBwAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNQ==", @@ -1092,7 +1029,7 @@ Response: { } }, "value": { - "json": "df4" + "json": "df5" } } } @@ -1103,7 +1040,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IJj9WTOaH4fXBwaq2+79tcdTWMlsLD90tAA99wRYadaKBAAAAAAAAAA=", + "cursor": "IIU7dPPcuBqgetb6flqtJ4+c3CCacVg96F3hIFND7GX9BAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNg==", @@ -1117,7 +1054,7 @@ Response: { } }, { - "cursor": "IMg/FO6gjiPZmCvmjnU/nAaf/yi6/pDjjfvGVfr/lqXOBAAAAAAAAAA=", + "cursor": "ILOizeXsOFtNA0PsWVFFDc1wNzvV5pHLPGoQ/3+oQ4isBAAAAAAAAAA=", "node": { "name": { "bcs": "A2RmNA==", @@ -1131,30 +1068,16 @@ Response: { } }, { - "cursor": "IN3UrBmzuomvuVn80suIIpOScrO99xrN0GJX752WrurUBAAAAAAAAAA=", - "node": { - "name": { - "bcs": "A2RmNg==", - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" - } - }, - "value": { - "json": "df6" - } - } - }, - { - "cursor": "IP9ZdEW4kSAmqHOsPwD086GsrTjnSVleaY7aiiokQfECBAAAAAAAAAA=", + "cursor": "INkGhuK4zepgllnwN5+ylkUrV9r7K2PmgnSqdECS86aaBAAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmNA==", + "bcs": "A2RmNQ==", "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String" } }, "value": { - "json": "df4" + "json": "df5" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp index fff4c15b7b7..0af1dde53cf 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp @@ -58,11 +58,11 @@ Response: { "nodes": [ { "value": { - "address": "0x8603ad20d654d0c0c01565eea9c2e60ef1c3451d8039ccb82b766b1bbe0b1b63", + "address": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f", "version": 5, "contents": { "json": { - "id": "0x8603ad20d654d0c0c01565eea9c2e60ef1c3451d8039ccb82b766b1bbe0b1b63", + "id": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f", "count": "0" } }, @@ -86,11 +86,11 @@ Response: { "nodes": [ { "value": { - "address": "0x8603ad20d654d0c0c01565eea9c2e60ef1c3451d8039ccb82b766b1bbe0b1b63", + "address": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f", "version": 5, "contents": { "json": { - "id": "0x8603ad20d654d0c0c01565eea9c2e60ef1c3451d8039ccb82b766b1bbe0b1b63", + "id": "0xaff6dda50b5130810c03f46780c788a2a7cd585ee4581f95987b935927d1fe1f", "count": "0" } }, @@ -98,11 +98,11 @@ Response: { "nodes": [ { "value": { - "address": "0xf951c0b6f5ab4e8bee9eb5e914129387a884624132c454575d203d545691a5a2", + "address": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62", "version": 6, "contents": { "json": { - "id": "0xf951c0b6f5ab4e8bee9eb5e914129387a884624132c454575d203d545691a5a2", + "id": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62", "count": "0" } } @@ -145,7 +145,7 @@ Response: { "object": { "owner": { "parent": { - "address": "0x31c25614224e45aadeb93d9117cb1485b4e37dde7649eb6f1145cad43eef6057" + "address": "0x1de03df5ffee42e90111e8d70c09bcb730067c0454de43126b4268a3d52ce49d" } }, "dynamicFields": { @@ -175,11 +175,11 @@ Response: { "nodes": [ { "value": { - "address": "0xf951c0b6f5ab4e8bee9eb5e914129387a884624132c454575d203d545691a5a2", + "address": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62", "version": 6, "contents": { "json": { - "id": "0xf951c0b6f5ab4e8bee9eb5e914129387a884624132c454575d203d545691a5a2", + "id": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62", "count": "0" } } @@ -203,11 +203,11 @@ Response: { "nodes": [ { "value": { - "address": "0xf951c0b6f5ab4e8bee9eb5e914129387a884624132c454575d203d545691a5a2", + "address": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62", "version": 6, "contents": { "json": { - "id": "0xf951c0b6f5ab4e8bee9eb5e914129387a884624132c454575d203d545691a5a2", + "id": "0xfaef186e54a8fa552021ab48bb81ceec2fd48da225c79daf74ecd2f3c8f5bc62", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp index a81e541d8bc..7ac216366d3 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp @@ -78,7 +78,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "ICL7pJfAQLj6WYX7JFqe8xzFC/CvS5IAKLUxLQMjEDPMAQAAAAAAAAA=", + "cursor": "IELBJuoqbljOwtDZvYNmHAhFckzJMAyIckHHx4VWEQmAAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMw==" @@ -89,7 +89,7 @@ Response: { } }, { - "cursor": "IDDmzOHqC1rNbC7svj9ulnV/RJFyPyAyQ1aRX/whHumNAQAAAAAAAAA=", + "cursor": "IE50PYtWegIrApc+e7eCSzFWzucYLDr5EFXOGSku7+5JAQAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMg==" @@ -100,13 +100,13 @@ Response: { } }, { - "cursor": "IIVQTTVQjMUkDYOy1/VGNfpBmQxaJo6M0SMfHyrWrbGAAQAAAAAAAAA=", + "cursor": "IHV1hfusMCdIxYwdoOX894dzfghsSphPFaIm4ekstxexAQAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmMQ==" }, "value": { - "json": "df2" + "json": "df1" } } } @@ -154,7 +154,7 @@ Contents: Test::M1::Parent { task 11, line 114: //# run Test::M1::mutate_df1 --sender A --args object(2,0) -mutated: object(0,0), object(2,0), object(4,0) +mutated: object(0,0), object(2,0), object(4,2) gas summary: computation_cost: 1000000, storage_cost: 4484000, storage_rebate: 4423200, non_refundable_storage_fee: 0 task 12, line 116: @@ -201,7 +201,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "ICL7pJfAQLj6WYX7JFqe8xzFC/CvS5IAKLUxLQMjEDPMAgAAAAAAAAA=", + "cursor": "IELBJuoqbljOwtDZvYNmHAhFckzJMAyIckHHx4VWEQmAAgAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMw==" @@ -212,7 +212,7 @@ Response: { } }, { - "cursor": "IDDmzOHqC1rNbC7svj9ulnV/RJFyPyAyQ1aRX/whHumNAgAAAAAAAAA=", + "cursor": "IE50PYtWegIrApc+e7eCSzFWzucYLDr5EFXOGSku7+5JAgAAAAAAAAA=", "node": { "name": { "bcs": "A2RmMg==" @@ -223,13 +223,13 @@ Response: { } }, { - "cursor": "IIVQTTVQjMUkDYOy1/VGNfpBmQxaJo6M0SMfHyrWrbGAAgAAAAAAAAA=", + "cursor": "IHV1hfusMCdIxYwdoOX894dzfghsSphPFaIm4ekstxexAgAAAAAAAAA=", "node": { "name": { - "bcs": "A2RmMg==" + "bcs": "A2RmMQ==" }, "value": { - "json": "df2" + "json": "df1_mutated" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp index 096fa5aa5cc..609ba4609fe 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp @@ -41,7 +41,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDyE8cX8asJQ38Rt/kwo8heuhhDsWyl1CHjK/D32HvIxAQAAAAAAAAA=", + "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -49,7 +49,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "0" } } @@ -65,7 +65,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "0" } } @@ -77,7 +77,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDyE8cX8asJQ38Rt/kwo8heuhhDsWyl1CHjK/D32HvIxAQAAAAAAAAA=", + "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAQAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -85,7 +85,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "0" } } @@ -101,7 +101,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "0" } } @@ -117,7 +117,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "0" } } @@ -168,7 +168,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "0" } } @@ -202,7 +202,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDyE8cX8asJQ38Rt/kwo8heuhhDsWyl1CHjK/D32HvIxAwAAAAAAAAA=", + "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAwAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -210,7 +210,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "1" } } @@ -226,7 +226,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "1" } } @@ -238,7 +238,7 @@ Response: { "dynamicFields": { "edges": [ { - "cursor": "IDyE8cX8asJQ38Rt/kwo8heuhhDsWyl1CHjK/D32HvIxAwAAAAAAAAA=", + "cursor": "IILk4DoK3o6yrxAwN0nWEvtu/px9bonymP5hhiRzZimMAwAAAAAAAAA=", "node": { "name": { "bcs": "KgAAAAAAAAA=" @@ -246,7 +246,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "1" } } @@ -262,7 +262,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "1" } } @@ -283,7 +283,7 @@ Response: { "value": { "contents": { "json": { - "id": "0x4df431020b1db28d623c6129f55c56c5664a167913fe46fce4bed4c0e1cd5c3b", + "id": "0x4d27bedb2ae9374644eb6e8066beee687ecd6af723928782e972f40ef683b5d1", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp index 1bf5bd620cd..d3d313eded0 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp @@ -62,11 +62,11 @@ Response: { "nodes": [ { "value": { - "address": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "version": 5, "contents": { "json": { - "id": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "count": "0" } }, @@ -90,11 +90,11 @@ Response: { "nodes": [ { "value": { - "address": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "version": 5, "contents": { "json": { - "id": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "count": "0" } }, @@ -102,11 +102,11 @@ Response: { "nodes": [ { "value": { - "address": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "version": 6, "contents": { "json": { - "id": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "count": "0" } } @@ -131,11 +131,11 @@ Response: { "nodes": [ { "value": { - "address": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "version": 7, "contents": { "json": { - "id": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "count": "1" } }, @@ -143,11 +143,11 @@ Response: { "nodes": [ { "value": { - "address": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "version": 6, "contents": { "json": { - "id": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "count": "0" } } @@ -172,11 +172,11 @@ Response: { "nodes": [ { "value": { - "address": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "address": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "version": 7, "contents": { "json": { - "id": "0x615e8039a1bf2fd65fc04d18cb2513e55837a421b1e39bd309d2b6fd3b8986a8", + "id": "0xb23e265ad3de2915b71beaed9646ac55bc5884e8280cfe0fca729a6ff86ce622", "count": "1" } }, @@ -184,11 +184,11 @@ Response: { "nodes": [ { "value": { - "address": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "version": 8, "contents": { "json": { - "id": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "count": "1" } } @@ -233,11 +233,11 @@ Response: { "nodes": [ { "value": { - "address": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "address": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "version": 6, "contents": { "json": { - "id": "0xc2dd55dcfaacddef3f214a2c31824b6b9b3c4bbd473718de32a7020d6311435e", + "id": "0xb11df24f6316d9054942a64b67fdf27ad90f9ec870efc4ad7e81237730497300", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp index b45454f5e94..3c0d96d8629 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp @@ -41,19 +41,19 @@ Response: { { "cursor": "eyJjIjozLCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "8twBu7kvzDbfSLjpBJ2GbDpfARJpwkdVCywZJqQCc3Eu" + "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V" } }, { "cursor": "eyJjIjozLCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "8fpjvnkVGNNbPNqNiB865VayCFzpvvtNkHWYWYAWWAZw" + "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc" } }, { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD" + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB" } }, { @@ -154,19 +154,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9", "node": { - "digest": "8twBu7kvzDbfSLjpBJ2GbDpfARJpwkdVCywZJqQCc3Eu" + "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V" } }, { "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9", "node": { - "digest": "8fpjvnkVGNNbPNqNiB865VayCFzpvvtNkHWYWYAWWAZw" + "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc" } }, { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD" + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB" } }, { @@ -183,19 +183,19 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "8twBu7kvzDbfSLjpBJ2GbDpfARJpwkdVCywZJqQCc3Eu" + "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V" } }, { "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "8fpjvnkVGNNbPNqNiB865VayCFzpvvtNkHWYWYAWWAZw" + "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc" } }, { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD" + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB" } } ] @@ -207,19 +207,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "5Fx8EKmMoiHb59rVr2ch64EgLyvs9SWhuUHq6x3HAx3T" + "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1" } }, { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "DvNBuuqGugb9p76oMb1jLa6MdAv7mT184x69bGKC2rQw" + "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG" } }, { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k" + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg" } }, { @@ -236,19 +236,19 @@ Response: { { "cursor": "eyJjIjo4LCJ0IjowLCJpIjpmYWxzZX0", "node": { - "digest": "8twBu7kvzDbfSLjpBJ2GbDpfARJpwkdVCywZJqQCc3Eu" + "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V" } }, { "cursor": "eyJjIjo4LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "8fpjvnkVGNNbPNqNiB865VayCFzpvvtNkHWYWYAWWAZw" + "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc" } }, { "cursor": "eyJjIjo4LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD" + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB" } }, { @@ -260,19 +260,19 @@ Response: { { "cursor": "eyJjIjo4LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "5Fx8EKmMoiHb59rVr2ch64EgLyvs9SWhuUHq6x3HAx3T" + "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1" } }, { "cursor": "eyJjIjo4LCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "DvNBuuqGugb9p76oMb1jLa6MdAv7mT184x69bGKC2rQw" + "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG" } }, { "cursor": "eyJjIjo4LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k" + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg" } } ] @@ -284,19 +284,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "2uLirA5sxREeS1UHEKCJWeoMv2R1MKCUiiep9Q6s7WA6" + "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj" } }, { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "4HgxdMoiQdZbLrd7ycQ3csPtccNPvr9BZW67ykV7NRk6" + "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "d9yohmp3svrBRKZjbfv7Gn5TbCrmspbqis2wy76ES1M" + "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP" } }, { @@ -313,19 +313,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9", "node": { - "digest": "8twBu7kvzDbfSLjpBJ2GbDpfARJpwkdVCywZJqQCc3Eu" + "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V" } }, { "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9", "node": { - "digest": "8fpjvnkVGNNbPNqNiB865VayCFzpvvtNkHWYWYAWWAZw" + "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc" } }, { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD" + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB" } }, { @@ -337,19 +337,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "5Fx8EKmMoiHb59rVr2ch64EgLyvs9SWhuUHq6x3HAx3T" + "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1" } }, { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "DvNBuuqGugb9p76oMb1jLa6MdAv7mT184x69bGKC2rQw" + "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG" } }, { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k" + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg" } }, { @@ -361,19 +361,19 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "2uLirA5sxREeS1UHEKCJWeoMv2R1MKCUiiep9Q6s7WA6" + "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj" } }, { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "4HgxdMoiQdZbLrd7ycQ3csPtccNPvr9BZW67ykV7NRk6" + "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "d9yohmp3svrBRKZjbfv7Gn5TbCrmspbqis2wy76ES1M" + "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP" } } ] @@ -395,13 +395,13 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxLCJpIjpmYWxzZX0", "node": { - "digest": "8fpjvnkVGNNbPNqNiB865VayCFzpvvtNkHWYWYAWWAZw" + "digest": "Hq1LQh51ZhntdNmuXMyMfKp6GAwWeMiS1HMYeJTuXoxc" } }, { "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD" + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB" } }, { @@ -420,13 +420,13 @@ Response: { { "cursor": "eyJjIjoxMSwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "DvNBuuqGugb9p76oMb1jLa6MdAv7mT184x69bGKC2rQw" + "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG" } }, { "cursor": "eyJjIjoxMSwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k" + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg" } }, { @@ -445,13 +445,13 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "4HgxdMoiQdZbLrd7ycQ3csPtccNPvr9BZW67ykV7NRk6" + "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD" } }, { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "d9yohmp3svrBRKZjbfv7Gn5TbCrmspbqis2wy76ES1M" + "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP" } }, { @@ -480,7 +480,7 @@ Response: { { "cursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD" + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB" } } ] @@ -493,7 +493,7 @@ Response: { { "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k" + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg" } } ] @@ -506,7 +506,7 @@ Response: { { "cursor": "eyJjIjoxMCwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "d9yohmp3svrBRKZjbfv7Gn5TbCrmspbqis2wy76ES1M" + "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP" } } ] @@ -527,24 +527,24 @@ Response: { { "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k", + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg", "sender": { "objects": { "edges": [ { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLBgAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TBgAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuBgAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsBgAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7BgAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsBgAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+BgAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtBgAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2BgAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSBgAAAAAAAAA=" } ] } @@ -558,33 +558,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9", "node": { - "digest": "3Wu2rNcM39pocoovpHUXZrWtwQXn8ZXAGpwrU7GthLLD", + "digest": "79od1gfpa4bdobeR94ZQ38ea2SbKVrnYo4KiRpUKZKyB", "sender": { "objects": { "edges": [ { - "cursor": "IADSYACaayWIeqSsYbYGygOHm+qGH85EWtI7FGVmu6jlDAAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA=" }, { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLDAAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuDAAAAAAAAAA=" + "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA=" }, { - "cursor": "IIBhlATYbPevAocg2y+ZqQu/SS+ryiQUhFJdTTaBb9XPDAAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7DAAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA=" }, { - "cursor": "IJFijS2QC5L0mgGDM8x75mv5mMwWRJMk+x9vBZwIoaU9DAAAAAAAAAA=" + "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+DAAAAAAAAAA=" + "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2DAAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA=" } ] } @@ -594,33 +594,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9", "node": { - "digest": "5Fx8EKmMoiHb59rVr2ch64EgLyvs9SWhuUHq6x3HAx3T", + "digest": "7qGUBfHDs1CziLgVJBXamBawVtztiyp2sAPdaRWiPNT1", "sender": { "objects": { "edges": [ { - "cursor": "IADSYACaayWIeqSsYbYGygOHm+qGH85EWtI7FGVmu6jlDAAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA=" }, { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLDAAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuDAAAAAAAAAA=" + "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA=" }, { - "cursor": "IIBhlATYbPevAocg2y+ZqQu/SS+ryiQUhFJdTTaBb9XPDAAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7DAAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA=" }, { - "cursor": "IJFijS2QC5L0mgGDM8x75mv5mMwWRJMk+x9vBZwIoaU9DAAAAAAAAAA=" + "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+DAAAAAAAAAA=" + "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2DAAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA=" } ] } @@ -630,33 +630,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9", "node": { - "digest": "DvNBuuqGugb9p76oMb1jLa6MdAv7mT184x69bGKC2rQw", + "digest": "BMAW5GS7peWfXNwjcNKYfRqWDJ5Mb7eY61o1KMcozhFG", "sender": { "objects": { "edges": [ { - "cursor": "IADSYACaayWIeqSsYbYGygOHm+qGH85EWtI7FGVmu6jlDAAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA=" }, { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLDAAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuDAAAAAAAAAA=" + "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA=" }, { - "cursor": "IIBhlATYbPevAocg2y+ZqQu/SS+ryiQUhFJdTTaBb9XPDAAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7DAAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA=" }, { - "cursor": "IJFijS2QC5L0mgGDM8x75mv5mMwWRJMk+x9vBZwIoaU9DAAAAAAAAAA=" + "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+DAAAAAAAAAA=" + "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2DAAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA=" } ] } @@ -666,33 +666,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9", "node": { - "digest": "ERSRy9F3o39NCDRWeDVz5AgBGZPmaCdXzzJ6tjd8eY7k", + "digest": "6dR6sJWFBCVAf65zvqJAZBwViUT1PdjmgWmPckqWHtpg", "sender": { "objects": { "edges": [ { - "cursor": "IADSYACaayWIeqSsYbYGygOHm+qGH85EWtI7FGVmu6jlDAAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA=" }, { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLDAAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuDAAAAAAAAAA=" + "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA=" }, { - "cursor": "IIBhlATYbPevAocg2y+ZqQu/SS+ryiQUhFJdTTaBb9XPDAAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7DAAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA=" }, { - "cursor": "IJFijS2QC5L0mgGDM8x75mv5mMwWRJMk+x9vBZwIoaU9DAAAAAAAAAA=" + "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+DAAAAAAAAAA=" + "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2DAAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA=" } ] } @@ -702,33 +702,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9", "node": { - "digest": "2uLirA5sxREeS1UHEKCJWeoMv2R1MKCUiiep9Q6s7WA6", + "digest": "5mUu9bxNaotcEsssawXpQWZ5Rd2RkjbssbZHy4YqP6jj", "sender": { "objects": { "edges": [ { - "cursor": "IADSYACaayWIeqSsYbYGygOHm+qGH85EWtI7FGVmu6jlDAAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA=" }, { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLDAAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuDAAAAAAAAAA=" + "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA=" }, { - "cursor": "IIBhlATYbPevAocg2y+ZqQu/SS+ryiQUhFJdTTaBb9XPDAAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7DAAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA=" }, { - "cursor": "IJFijS2QC5L0mgGDM8x75mv5mMwWRJMk+x9vBZwIoaU9DAAAAAAAAAA=" + "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+DAAAAAAAAAA=" + "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2DAAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA=" } ] } @@ -738,33 +738,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9", "node": { - "digest": "4HgxdMoiQdZbLrd7ycQ3csPtccNPvr9BZW67ykV7NRk6", + "digest": "26L1PsnhdXmQHEgRiqw9WTMmFZy8CJUjta7yGuuvH7DD", "sender": { "objects": { "edges": [ { - "cursor": "IADSYACaayWIeqSsYbYGygOHm+qGH85EWtI7FGVmu6jlDAAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA=" }, { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLDAAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuDAAAAAAAAAA=" + "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA=" }, { - "cursor": "IIBhlATYbPevAocg2y+ZqQu/SS+ryiQUhFJdTTaBb9XPDAAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7DAAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA=" }, { - "cursor": "IJFijS2QC5L0mgGDM8x75mv5mMwWRJMk+x9vBZwIoaU9DAAAAAAAAAA=" + "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+DAAAAAAAAAA=" + "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2DAAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA=" } ] } @@ -774,33 +774,33 @@ Response: { { "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ", "node": { - "digest": "d9yohmp3svrBRKZjbfv7Gn5TbCrmspbqis2wy76ES1M", + "digest": "9Rztd6zgt6r1kZ5hUPALhi8K2ZXBBDj8d2aF3cemSZCP", "sender": { "objects": { "edges": [ { - "cursor": "IADSYACaayWIeqSsYbYGygOHm+qGH85EWtI7FGVmu6jlDAAAAAAAAAA=" + "cursor": "IB/Q9QzQF/l7BIpKd528Z8tTh9F6eZhLGBmkKbf/tO9TDAAAAAAAAAA=" }, { - "cursor": "IByRl+xjLSNEC4Q+Y0Few4xDVIcYyUxyZ4oe7WO63+sLDAAAAAAAAAA=" + "cursor": "ICGnNCh4I2/HaGHwgcf6iD7ctXQIY/PunZT9z735xdJsDAAAAAAAAAA=" }, { - "cursor": "IFStyAU4OS4HEIphwSJjArUsneR9JgYjXqrUZixEvrQuDAAAAAAAAAA=" + "cursor": "IHVnj4DBePBVwex0Zi+gGmPcMVtPCdP82UODiOt5gTM3DAAAAAAAAAA=" }, { - "cursor": "IIBhlATYbPevAocg2y+ZqQu/SS+ryiQUhFJdTTaBb9XPDAAAAAAAAAA=" + "cursor": "IHX+byCmKcy4ITqnqews9sS/OkceFRnc982c7S3ATrNsDAAAAAAAAAA=" }, { - "cursor": "IIdbcBHo+WUMzya2grau6zYFD5ZlFX1HQH4pJXAOaRQ7DAAAAAAAAAA=" + "cursor": "IITWL6MXHEmVXm4QNxBd8p+ZCNp4uHJaX8C5gh9VzXAtDAAAAAAAAAA=" }, { - "cursor": "IJFijS2QC5L0mgGDM8x75mv5mMwWRJMk+x9vBZwIoaU9DAAAAAAAAAA=" + "cursor": "IJyG2SKgEvEV9Z8kB4U0JMQv1ohPcJhTqCciCcSGdClVDAAAAAAAAAA=" }, { - "cursor": "IL4LyEqyfHaJp7x1F47HggXP5K/uTKM7JwRm7NYblBk+DAAAAAAAAAA=" + "cursor": "IKhrY2+bvMHD2r1rakSvggO3lKZRHndT25WguCOH4hNRDAAAAAAAAAA=" }, { - "cursor": "IOuXfIr/MFNZLw/UcBw1yb4Asy3a7l9mjzGLhiX0TNM2DAAAAAAAAAA=" + "cursor": "IK/PYAxfnGBPTvQuJjjAlDX1bI4ft+Ho3hD6OQmoySXSDAAAAAAAAAA=" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp index 9d554e7d4f5..74fdc1870f4 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp @@ -29,7 +29,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "0" } } @@ -57,7 +57,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "1" } } @@ -69,7 +69,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "0" } } @@ -104,7 +104,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "1" } } @@ -134,7 +134,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "1" } } @@ -151,7 +151,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "0" } } @@ -205,7 +205,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "1" } } @@ -222,7 +222,7 @@ Response: { "asMoveObject": { "contents": { "json": { - "id": "0x38a4c99d150ee4023f4ecd569c9c49c86c45a5d58bf9dda1355497eacacb7850", + "id": "0x8c1a40e2608492f92365d5bd1edc6388bcf2769244597f1e19caa1b0a00513da", "value": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp index 4c7a46a402d..8d1ce341b94 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp @@ -31,20 +31,7 @@ Response: { "data": { "one_of_these_will_yield_an_object": { "objects": { - "nodes": [ - { - "version": 4, - "contents": { - "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" - }, - "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" - } - } - } - ] + "nodes": [] } }, "if_the_other_does_not": { @@ -54,10 +41,10 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", "value": "0" } } @@ -90,20 +77,7 @@ Response: { "data": { "paginating_on_checkpoint_1": { "objects": { - "nodes": [ - { - "version": 4, - "contents": { - "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" - }, - "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" - } - } - } - ] + "nodes": [] } }, "should_not_have_more_than_one_result": { @@ -113,10 +87,10 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", "value": "0" } } @@ -135,50 +109,50 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" + "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409", + "value": "2" } } }, { - "version": 3, + "version": 4, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", + "value": "1" } } }, { - "version": 5, + "version": 3, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x36f05b1d8a31406630118071eb1742dfc0c6283062b254d8e8e64d24320fd382", - "value": "2" + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", + "value": "0" } } }, { - "version": 4, + "version": 6, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } } } @@ -196,50 +170,50 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" + "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409", + "value": "2" } } }, { - "version": 3, + "version": 4, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", + "value": "1" } } }, { - "version": 5, + "version": 3, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x36f05b1d8a31406630118071eb1742dfc0c6283062b254d8e8e64d24320fd382", - "value": "2" + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", + "value": "0" } } }, { - "version": 4, + "version": 6, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } } } @@ -270,10 +244,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", "value": "1" } }, @@ -282,64 +256,64 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 1, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", + "balance": { + "value": "300000000000000" + } } } }, { - "version": 3, + "version": 5, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409", + "value": "2" } } }, { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x36f05b1d8a31406630118071eb1742dfc0c6283062b254d8e8e64d24320fd382", - "value": "2" + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", + "value": "0" } } }, { - "version": 1, + "version": 6, "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", - "balance": { - "value": "300000000000000" - } + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } } } @@ -347,87 +321,81 @@ Response: { } } } - } - ] - } - }, - "before_obj_6_0_at_checkpoint_2": { - "nodes": [ - { - "version": 6, - "asMoveObject": { + }, + { + "version": 3, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", + "value": "0" } }, - "note_that_owner_result_should_reflect_latest_state": { + "owner_at_latest_state_has_iota_only": { "owner": { "objects": { "nodes": [ { - "version": 6, + "version": 1, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", + "balance": { + "value": "300000000000000" + } } } }, { - "version": 3, + "version": 5, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409", + "value": "2" } } }, { - "version": 5, + "version": 4, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x36f05b1d8a31406630118071eb1742dfc0c6283062b254d8e8e64d24320fd382", - "value": "2" + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", + "value": "1" } } }, { - "version": 4, + "version": 3, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", + "value": "0" } } }, { - "version": 1, + "version": 6, "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", - "balance": { - "value": "300000000000000" - } + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } } } @@ -435,18 +403,16 @@ Response: { } } } - } - }, - { - "version": 3, - "asMoveObject": { + }, + { + "version": 6, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } }, "owner_at_latest_state_has_iota_only": { @@ -454,26 +420,16 @@ Response: { "objects": { "nodes": [ { - "version": 6, - "contents": { - "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" - }, - "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" - } - } - }, - { - "version": 3, + "version": 1, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", + "balance": { + "value": "300000000000000" + } } } }, @@ -481,10 +437,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x36f05b1d8a31406630118071eb1742dfc0c6283062b254d8e8e64d24320fd382", + "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409", "value": "2" } } @@ -493,10 +449,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", "value": "1" } } @@ -505,25 +461,23 @@ Response: { "version": 3, "contents": { "type": { - "repr": "0x7895c5a0f0ad150cb86744f590e62cbb263e3cca4125e8fb809bf873f89aacd5::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x7c09c4d70be4ebe9e73e2abd838396683c406130b101422fa066a3454b0b86a0", + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", "value": "0" } } }, { - "version": 1, + "version": 6, "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", - "balance": { - "value": "300000000000000" - } + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } } } @@ -591,11 +545,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" + "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409", + "value": "2" } } }, @@ -603,11 +557,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", + "value": "1" } } }, @@ -615,11 +569,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x36f05b1d8a31406630118071eb1742dfc0c6283062b254d8e8e64d24320fd382", - "value": "2" + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", + "value": "0" } } }, @@ -627,11 +581,11 @@ Response: { "version": 7, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } } } @@ -649,50 +603,50 @@ Response: { "objects": { "nodes": [ { - "version": 6, + "version": 5, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x0276236f1293f0797f2a9d85f4385dc166206d14963eb528a8f0cb82171e4a1c", - "value": "3" + "id": "0x23f0b02cd7c428390e14aac34b5677662593d02bd26f29097eee0885bd32e409", + "value": "2" } } }, { - "version": 3, + "version": 4, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x239663104e1d8db2011e6eb4df325556361bbf73414d25d4545491d30b351666", - "value": "0" + "id": "0x459eefbe82c1f2eceaa293085408b3959db89b88aef5ac8359e3f637f9e20315", + "value": "1" } } }, { - "version": 5, + "version": 3, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x36f05b1d8a31406630118071eb1742dfc0c6283062b254d8e8e64d24320fd382", - "value": "2" + "id": "0x5c76eac8095495f0bcb5569dd535172e4f4fdf76fedd97d97ebe3a332811f88a", + "value": "0" } } }, { - "version": 4, + "version": 6, "contents": { "type": { - "repr": "0xa9cbee3dea1fbcfbc892ff3689f58dc1620558f5f31f6cd3e2b75010e2df732c::M1::Object" + "repr": "0x2ce2fe50016683a5ad096b8c1e8ea6c49de008c19cee60f38a4d51c92a475e6c::M1::Object" }, "json": { - "id": "0x4c94d3aa104e529fdf2ce54b0813332b0b587d5b36d04ec87a9776db93ae093a", - "value": "1" + "id": "0x9844d52d8e6114c534d1c6f4ce72aa53e3b82c061765b50dbda7c0d1f403c604", + "value": "3" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp index d71ecb2f586..e916dfe4b80 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp @@ -46,10 +46,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "100" } } @@ -85,10 +85,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "100" } } @@ -110,10 +110,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } } @@ -122,10 +122,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0xd7532dbf3fb07f34f65015771ec654b90c30249994723242054b88f36bd177d3", + "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4", "value": "1" } } @@ -145,10 +145,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } }, @@ -160,10 +160,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } } @@ -172,10 +172,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0xd7532dbf3fb07f34f65015771ec654b90c30249994723242054b88f36bd177d3", + "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4", "value": "1" } } @@ -216,10 +216,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } }, @@ -231,10 +231,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } } @@ -243,10 +243,10 @@ Response: { "version": 4, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0xd7532dbf3fb07f34f65015771ec654b90c30249994723242054b88f36bd177d3", + "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4", "value": "1" } } @@ -273,10 +273,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } } @@ -285,10 +285,10 @@ Response: { "version": 6, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0xd7532dbf3fb07f34f65015771ec654b90c30249994723242054b88f36bd177d3", + "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4", "value": "300" } } @@ -308,10 +308,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } }, @@ -323,10 +323,10 @@ Response: { "version": 5, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0x17955f8b7d4669db399762e0f49286537d4b5cc715d098b704975cde14330807", + "id": "0xd5461cd6dc46396aca90b8e0993cae894e591eccae95f57a5554d6281985186c", "value": "200" } } @@ -335,10 +335,10 @@ Response: { "version": 6, "contents": { "type": { - "repr": "0x9a9f3049a8b227506cd1f5b7dbd3dd0aa91af7f3a23e25ae4d189bd2e113be7e::M1::Object" + "repr": "0x5fa5759bca29623e75cb16a13373d58bd43e66ca4b9b7d5dc8fe13dd8f62621e::M1::Object" }, "json": { - "id": "0xd7532dbf3fb07f34f65015771ec654b90c30249994723242054b88f36bd177d3", + "id": "0xddbf5f19a787733472a1307dee787bc19d81f35e79ab97eb23fbbcf8559304d4", "value": "300" } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp index 51fd00a74af..825fcaf6369 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp @@ -35,11 +35,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec432cac95eff36e85cb215430943ddc198ae47b8a22e325c1dcc542363b0a7", - "value": "222" + "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3", + "value": "225" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -54,11 +54,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -76,11 +76,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe513f99daeb9c6a48fac0f0cf25b99a30f6011207ce0608495d5532a5e44b14", - "value": "259" + "id": "0xfea66842c8932937f3017932a529561aee49bc62a64338bb0b1b6cc6f27bb8d0", + "value": "189" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } }, @@ -92,11 +92,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec21d038be0759da9ac70f793a5f4cd8de5e5c84bb1f731fead162a30959cd6", - "value": "299" + "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a", + "value": "108" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } }, @@ -108,11 +108,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec432cac95eff36e85cb215430943ddc198ae47b8a22e325c1dcc542363b0a7", - "value": "222" + "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3", + "value": "225" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } }, @@ -124,11 +124,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -163,7 +163,7 @@ Contents: Test::M1::Object { bytes: fake(2,498), }, }, - value: 222u64, + value: 225u64, } task 9, line 93: @@ -176,7 +176,7 @@ Contents: Test::M1::Object { bytes: fake(2,497), }, }, - value: 299u64, + value: 108u64, } task 10, line 95: @@ -199,11 +199,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec21d038be0759da9ac70f793a5f4cd8de5e5c84bb1f731fead162a30959cd6", - "value": "299" + "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a", + "value": "108" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -218,11 +218,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec432cac95eff36e85cb215430943ddc198ae47b8a22e325c1dcc542363b0a7", - "value": "222" + "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3", + "value": "225" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -237,11 +237,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -260,11 +260,11 @@ Response: { }, "contents": { "json": { - "id": "0xfe513f99daeb9c6a48fac0f0cf25b99a30f6011207ce0608495d5532a5e44b14", - "value": "259" + "id": "0xfea66842c8932937f3017932a529561aee49bc62a64338bb0b1b6cc6f27bb8d0", + "value": "189" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -287,11 +287,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -305,11 +305,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -325,11 +325,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec21d038be0759da9ac70f793a5f4cd8de5e5c84bb1f731fead162a30959cd6", - "value": "299" + "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a", + "value": "108" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -343,11 +343,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec432cac95eff36e85cb215430943ddc198ae47b8a22e325c1dcc542363b0a7", - "value": "222" + "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3", + "value": "225" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -361,11 +361,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -383,11 +383,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec21d038be0759da9ac70f793a5f4cd8de5e5c84bb1f731fead162a30959cd6", - "value": "299" + "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a", + "value": "108" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -401,11 +401,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec432cac95eff36e85cb215430943ddc198ae47b8a22e325c1dcc542363b0a7", - "value": "222" + "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3", + "value": "225" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -419,11 +419,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } @@ -442,7 +442,7 @@ Response: { }, "contents": { "json": { - "id": "0x12458bdc1e04395483544cf98ec61de64bc9e2bf11bf8cc09121c266e151f623", + "id": "0x6214297c96396ed233024d61f0b882a1b3a3da30abc8ea6e234d93b7c2a0c6ae", "balance": { "value": "300000000000000" } @@ -461,11 +461,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec21d038be0759da9ac70f793a5f4cd8de5e5c84bb1f731fead162a30959cd6", - "value": "299" + "id": "0xff48a550044bae201697197e3541eedbbbda0418f39f11e6a8eee3c5422d582a", + "value": "108" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } }, @@ -478,11 +478,11 @@ Response: { }, "contents": { "json": { - "id": "0xfec432cac95eff36e85cb215430943ddc198ae47b8a22e325c1dcc542363b0a7", - "value": "222" + "id": "0xffab14ca154ad43c09db1837da78145762dc0181d54477753e13450a08f54ff3", + "value": "225" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } }, @@ -495,11 +495,11 @@ Response: { }, "contents": { "json": { - "id": "0xff9cd28672a00578a487ca017d55899a9d2bffe395546d4986e3d98251c8bc2b", - "value": "351" + "id": "0xffb620aa04580847eefb8133be8829adaa3ac33155927084561c44bb51310a1a", + "value": "385" }, "type": { - "repr": "0xe3ea63728974cf03f1366718b6d9d3d3d8450e811ea17a4f77209e4b077a4423::M1::Object" + "repr": "0x4fed56e4707c2c3215eecdebd194f7d6a13c1e2005add7d5d076e82edfecabbf::M1::Object" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp index 2e4fb003972..0ab08a229ba 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp @@ -25,11 +25,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 3, line 25: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [171, 56, 174, 116, 116, 231, 90, 122, 148, 80, 189, 213, 3, 8, 47, 190, 80, 171, 87, 32, 84, 9, 231, 203, 82, 3, 186, 181, 58, 235, 194, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } -created: object(3,0), object(3,1) -mutated: 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) -deleted: object(_), object(2,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +created: object(3,0) +mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) +deleted: object(2,0) +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 4, line 27: //# create-checkpoint @@ -49,7 +49,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 7, line 35: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(6,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [171, 56, 174, 116, 116, 231, 90, 122, 148, 80, 189, 213, 3, 8, 47, 190, 80, 171, 87, 32, 84, 9, 231, 203, 82, 3, 186, 181, 58, 235, 194, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(7,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(6,0) @@ -109,13 +109,13 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "ICyVnatyIW8BBQyropcZeyQEQxpFiSDIk5mD/WFlco2wBAAAAAAAAAA=", + "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdBAAAAAAAAAA=", "node": { "principal": "10000000000" } }, { - "cursor": "IFRKz2tTggQgu1xvCFWrIDLlqvonsA/vzDzPPN8u8UDtBAAAAAAAAAA=", + "cursor": "IKp2oYTL+6GLcESjpGjrpK2DOI3ytxsbPpDzuODNkWkaBAAAAAAAAAA=", "node": { "principal": "10000000000" } @@ -158,10 +158,15 @@ task 14, lines 105-148: Response: { "data": { "coins_after_obj_3_0_chkpt_3": { + "stakedIotas": { + "edges": [] + } + }, + "coins_before_obj_3_0_chkpt_3": { "stakedIotas": { "edges": [ { - "cursor": "IFRKz2tTggQgu1xvCFWrIDLlqvonsA/vzDzPPN8u8UDtAwAAAAAAAAA=", + "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdAwAAAAAAAAA=", "node": { "principal": "10000000000" } @@ -169,27 +174,22 @@ Response: { ] } }, - "coins_before_obj_3_0_chkpt_3": { - "stakedIotas": { - "edges": [] - } - }, "coins_after_obj_7_0_chkpt_3": { - "stakedIotas": { - "edges": [] - } - }, - "coins_before_obj_7_0_chkpt_3": { "stakedIotas": { "edges": [ { - "cursor": "ICyVnatyIW8BBQyropcZeyQEQxpFiSDIk5mD/WFlco2wAwAAAAAAAAA=", + "cursor": "IKp2oYTL+6GLcESjpGjrpK2DOI3ytxsbPpDzuODNkWkaAwAAAAAAAAA=", "node": { "principal": "10000000000" } } ] } + }, + "coins_before_obj_7_0_chkpt_3": { + "stakedIotas": { + "edges": [] + } } } } diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp index 950b02f0932..12640d34fb8 100644 --- a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp +++ b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp @@ -61,66 +61,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -136,66 +136,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -209,66 +209,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -284,7 +284,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", "balance": { "value": "299999993067600" } @@ -306,66 +306,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -390,66 +390,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -463,66 +463,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -538,7 +538,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", "balance": { "value": "300000000000000" } @@ -557,66 +557,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -630,66 +630,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -705,7 +705,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", "balance": { "value": "299999996697200" } @@ -724,66 +724,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -797,66 +797,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -872,7 +872,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", "balance": { "value": "299999993067600" } @@ -907,66 +907,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -982,66 +982,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1055,66 +1055,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1130,7 +1130,7 @@ Response: { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x875b7011e8f9650ccf26b682b6aeeb36050f9665157d47407e2925700e69143b", + "id": "0x1fd0f50cd017f97b048a4a779dbc67cb5387d17a79984b1819a429b7ffb4ef53", "balance": { "value": "299999993067600" } @@ -1152,66 +1152,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1240,66 +1240,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1313,66 +1313,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1388,66 +1388,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1461,66 +1461,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1536,66 +1536,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } @@ -1609,66 +1609,66 @@ Response: { { "contents": { "json": { - "id": "0x1cf95cbbb66d52398519dbe561c026c8b2f8f3ca58294f162ad9a1f2957d6035", - "value": "3" + "id": "0x4f263537d7fe5e33e686f35580d88127cf67ca98fe3cce7dd910635eba391586", + "value": "4" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x20f00cdc31f4b422ecda21ace92ea2ade64d9a5aa38c03cf526a7f67836deff0", - "value": "2" + "id": "0x5941bc00a228a02d0db39d77f0cf61e36dbe9a1013f273e9ed0ee02eb3259160", + "value": "5" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x27204d98aadcf334e4b1a4fa39208c260669339c83808e2eb04e7ad4b1ba01cd", - "value": "5" + "id": "0x620fc261f44d1a27f42d6c8bd9d95c22c781966926056c56e4274140ba02d1b6", + "value": "3" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x82ef8d537fb2fe2c4a35f50cec7d8e46a96ffa1e76f90a66144b3e247696d17d", + "id": "0xaed872c4119b75506c212811899e9414db6106e3f687222db8833062003fa46e", "value": "200" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0x96a37c40cad4455aedf4d66f8d94aa9f91542bf2a6766f0669cf91058f82c0ed", - "value": "4" + "id": "0xba33c3291e8547a7ee8c971c786ffa720d3df52650e5ff493be10d52c86688d9", + "value": "6" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } }, { "contents": { "json": { - "id": "0xdfa6c182e56bdcafb49a262da0da5ed17a58b8d53e9e4378baebc71748b5b3dc", - "value": "6" + "id": "0xc331b92ab20dd4a424b17a2c0bf507b935a92f84caee9b6f9717a61dc356607c", + "value": "2" }, "type": { - "repr": "0x54c66a0373d27370da1294a4635920f2f8f3b09e1befe9de0d5602bbbbd4d1a7::M1::Object" + "repr": "0xfc270c987b7201d57da23ca7c3f431b2363860e19bb32efae81175586340241d::M1::Object" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp index c150dc82e61..5053dbae825 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp @@ -11,6 +11,6 @@ task 2, lines 10-13: //# run-graphql Response: { "data": { - "chainIdentifier": "e1d5137d" + "chainIdentifier": "e50daeb7" } } diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp index 9c0db92393c..9877e3587b3 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp @@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, lines 17-19: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [171, 56, 174, 116, 116, 231, 90, 122, 148, 80, 189, 213, 3, 8, 47, 190, 80, 171, 87, 32, 84, 9, 231, 203, 82, 3, 186, 181, 58, 235, 194, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) @@ -67,7 +67,7 @@ Response: { ] }, "validatorCandidatesSize": 0, - "inactivePoolsId": "0xa0ca410cb152a8d20832f3009367a5e33c1d8c3c20d146d7c6b749952e6b92ec" + "inactivePoolsId": "0x847b4f25419bcc012e269b2586a54b663d563de25024075481eb96e3ee8c3e0d" }, "totalGasFees": "1000000", "totalStakeRewards": "767000000000000", @@ -81,7 +81,7 @@ Response: { "kind": { "__typename": "ProgrammableTransactionBlock" }, - "digest": "4SwJFCerfaDJbFof2RVhiGmbbAjiiYA2nyurwzaF7NoK" + "digest": "93Nc7AV6A8XVKLh2r9VPCjAQwoVbuiEGSqUwGBCAKee5" }, { "kind": { diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp index 45331d2008c..37638f48051 100644 --- a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp +++ b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp @@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, line 19: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [238, 153, 37, 48, 37, 251, 65, 114, 78, 217, 166, 206, 113, 249, 11, 156, 146, 124, 75, 213, 236, 255, 221, 178, 144, 192, 67, 121, 55, 3, 90, 248, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [205, 123, 84, 147, 81, 17, 130, 7, 90, 160, 180, 5, 78, 14, 89, 255, 128, 163, 195, 96, 66, 172, 246, 192, 149, 249, 164, 137, 55, 137, 167, 163, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) @@ -61,7 +61,7 @@ Epoch advanced: 3 task 12, line 37: //# run 0x3::iota_system::request_withdraw_stake --args object(0x5) object(4,0) --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [238, 153, 37, 48, 37, 251, 65, 114, 78, 217, 166, 206, 113, 249, 11, 156, 146, 124, 75, 213, 236, 255, 221, 178, 144, 192, 67, 121, 55, 3, 90, 248, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [205, 123, 84, 147, 81, 17, 130, 7, 90, 160, 180, 5, 78, 14, 89, 255, 128, 163, 195, 96, 66, 172, 246, 192, 149, 249, 164, 137, 55, 137, 167, 163, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] } created: object(12,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(4,0) diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp index bd9c13a8314..bc31e0d2577 100644 --- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp +++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp @@ -77,67 +77,67 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callU8' (line 30), abort 'ImAU8': 0" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU8' (line 30), abort 'ImAU8': 0" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callU16' (line 33), abort 'ImAU16': 1" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU16' (line 33), abort 'ImAU16': 1" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callU32' (line 36), abort 'ImAU32': 2" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU32' (line 36), abort 'ImAU32': 2" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callU64' (line 39), abort 'ImAU64': 3" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU64' (line 39), abort 'ImAU64': 3" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callU128' (line 42), abort 'ImAU128': 4" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU128' (line 42), abort 'ImAU128': 4" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callU256' (line 45), abort 'ImAU256': 5" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU256' (line 45), abort 'ImAU256': 5" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callString' (line 51), abort 'ImAString': This is a string" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callString' (line 51), abort 'ImAString': This is a string" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA=" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA=" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::normalAbort' (instruction 1), abort code: 0" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::normalAbort' (instruction 1), abort code: 0" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x89423a90eca23c8d14ab44895f6f8b49e1e692e2e7ea8a9adb677e982cff2a99::m::assertLineNo' (line 60)" + "errors": "Error in 1st command, from '0x272f89312434a7e0b32617380778c571431e5b379e2ad4cbd1660981e617300e::m::assertLineNo' (line 60)" } } ] @@ -248,7 +248,7 @@ Response: { }, "errors": [ { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -264,7 +264,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -280,7 +280,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -296,7 +296,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -312,7 +312,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -328,7 +328,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -344,7 +344,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -360,7 +360,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, @@ -376,7 +376,7 @@ Response: { ] }, { - "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: f4edd879a3a46dd7756ce940d92d10443b1e930ebfafc542ee488fb6d94c29fb", + "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 168dbb87a20484b73a83e5df7991f60e1eac7cb5d2bb7175ae45ce2d3ae3ea60", "locations": [ { "line": 6, diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp index 2a1dad360a2..eb63fd74a73 100644 --- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp +++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp @@ -37,19 +37,19 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x232dca06e9cd0e6f2f6d5a3fbf1dae33e98e604f83bab179a2941b9829442fe5::m::t_a' (line 21)" + "errors": "Error in 1st command, from '0xf986879d81b7d0b4f49b825917bd6a5b38f9764b5d1aebc2186f279b2427f3d8::m::t_a' (line 21)" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x232dca06e9cd0e6f2f6d5a3fbf1dae33e98e604f83bab179a2941b9829442fe5::m::t_calls_a' (line 24)" + "errors": "Error in 1st command, from '0xf986879d81b7d0b4f49b825917bd6a5b38f9764b5d1aebc2186f279b2427f3d8::m::t_calls_a' (line 24)" } }, { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0x232dca06e9cd0e6f2f6d5a3fbf1dae33e98e604f83bab179a2941b9829442fe5::m::t_const_assert' (line 10), abort 'EMsg': This is a string" + "errors": "Error in 1st command, from '0xf986879d81b7d0b4f49b825917bd6a5b38f9764b5d1aebc2186f279b2427f3d8::m::t_const_assert' (line 10), abort 'EMsg': This is a string" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp index 3bc37bd892e..f75860547fe 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp @@ -62,7 +62,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventA" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -80,7 +80,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventB<0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::Object>" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -98,7 +98,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M2::EventA" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -116,7 +116,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M2::EventB<0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M2::Object>" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -145,7 +145,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventA" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -163,7 +163,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventB<0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::Object>" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -181,7 +181,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M2::EventA" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -199,7 +199,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M2::EventB<0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M2::Object>" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M2::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -228,7 +228,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventA" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -246,7 +246,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventB<0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::Object>" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -275,7 +275,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventA" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -304,7 +304,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::EventB<0xbbc4ca6eb4699aae135eeaf9dc150a0d4aa62872e29f557ab7416f1eadcf434a::M1::Object>" + "repr": "0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::EventB<0xd371fbe5cbff8564a9eaa134fddceda7f7b9ced168da92257226477c8e29ddcd::M1::Object>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp index af318745132..00f41ed55ae 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp @@ -30,7 +30,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0xe97fc5bb4773ce63b9891018d2859918153e40e7db15133fd25cd170734cef6f::M1::EventA" + "repr": "0xd2f29f7361ce369a36924576b23440a0a3b81ab975c44c7e837e6d74ff0e4a51::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -56,7 +56,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0xe97fc5bb4773ce63b9891018d2859918153e40e7db15133fd25cd170734cef6f::M1::EventA" + "repr": "0xd2f29f7361ce369a36924576b23440a0a3b81ab975c44c7e837e6d74ff0e4a51::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -102,7 +102,7 @@ Response: { "name": "M3" }, "type": { - "repr": "0xe97fc5bb4773ce63b9891018d2859918153e40e7db15133fd25cd170734cef6f::M1::EventA" + "repr": "0xd2f29f7361ce369a36924576b23440a0a3b81ab975c44c7e837e6d74ff0e4a51::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp index 6ea0b3c6b60..17d9efd6aa0 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp @@ -33,12 +33,12 @@ Response: { "nodes": [ { "json": { - "id": "0x2b91473159957c052b1a93d9c1376ab0d91b605c8316be4b2662e9cc336d083e" + "id": "0x9a734cbfbfeed77d0efa6574430f2ebae3c84c16a81f4cf11e4fa101ed54baa3" } }, { "json": { - "id": "0x2b91473159957c052b1a93d9c1376ab0d91b605c8316be4b2662e9cc336d083e", + "id": "0x9a734cbfbfeed77d0efa6574430f2ebae3c84c16a81f4cf11e4fa101ed54baa3", "version": 1, "fields": { "contents": [ diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp index 3e71075225a..0c54da135ec 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp @@ -42,7 +42,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -60,7 +60,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -78,7 +78,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -111,7 +111,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -129,7 +129,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -162,7 +162,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -180,7 +180,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -213,7 +213,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -231,7 +231,7 @@ Response: { "name": "M1" }, "type": { - "repr": "0xcbb55f60a0de682701cda4af908db58c79fdc776113e863da4c5d1ddd0b8e5cf::M1::EventA" + "repr": "0xc9397d10a3be916a77114efa9fdabf14e54811b454e4798357964ce380726952::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp index 59d932eaa55..48cb46c959c 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp @@ -37,19 +37,19 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "8twBu7kvzDbfSLjpBJ2GbDpfARJpwkdVCywZJqQCc3Eu" + "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V" }, { - "digest": "GaaiNS8XyGWps9PtJ2ApYExhGVZrc7wPuzbYezy5c8WU" + "digest": "ErvTYR6mPWiZYePpStGyH6Nw8ckgpSzrPgGw7Vkdw6JK" }, { - "digest": "3BB3PxmDSRahQe17BJZFE4tidPq4L9nGzabs7DF1jqvD" + "digest": "FN7PLE3HgySgBBAoFSxAjnoDk6iuXBoREtCwT8VHErcT" }, { - "digest": "8kPLT27dhuva4i5SCqEZFFsBuBD1NZuYcMZnVBEPkhnU" + "digest": "3KCnLq3sQtjsuxxQahpwYzGE5SwKbYFM4qXAjKDjc2QB" }, { - "digest": "5NrZrqgHFvE75nD5DmpyWgbr1rjPNwFqh86cn2v9eB7V" + "digest": "F3rgBaRQZ6Fjyw1YS2LFjyc4WzbTAKWzev2atucRxMGa" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp index 94cafd894b3..fc1c99398df 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp @@ -30,7 +30,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M1::EventA" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -72,7 +72,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M1::EventA" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -98,7 +98,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M2::EventB" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -124,7 +124,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M1::EventA" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -139,7 +139,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M2::EventB" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -165,7 +165,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M1::EventA" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M1::EventA" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -180,7 +180,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M2::EventB" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -195,7 +195,7 @@ Response: { "name": "M2" }, "type": { - "repr": "0xbd28426e10aae174ca0ee0574592a36e7b996541f639d2c042f8c1ec9a083c33::M2::EventB" + "repr": "0xd0c1754de67ee1c885b1c90d519183c869fa19832016a643da621a34262c8abe::M2::EventB" }, "sender": { "address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp index b76b284381b..38b26be0442 100644 --- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp +++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp @@ -38,19 +38,19 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "8twBu7kvzDbfSLjpBJ2GbDpfARJpwkdVCywZJqQCc3Eu" + "digest": "b5R95kKQ5woMzx3Qv8GjKKG7JZZLLsg1DAFkuKULx7V" }, { - "digest": "DajMe5yQb58g3mEg5Lro7654ttnUL7WYbAcfdJQusLQy" + "digest": "5g71h54kuLvR1x5RBRZFHeqUjyx7o7DhxFvHzu9BVbMA" }, { - "digest": "HBZfkNS4HTKTqSf6xsBBrBkTP9FTP8s2kFHYEeGV3i2F" + "digest": "HB6E8FBSJw7ViXKkqmZTAgY5t4E5uainW5BtWSbbWfTu" }, { - "digest": "FMUBpggCSevRg1mMsj7xyJ8Hcwk1u49SWnZo2arciPxM" + "digest": "4Aa1YhftZmqnzDfvMk2oTatJjvYY2PVtne7FchQXfgTU" }, { - "digest": "ECJhnduFaZDQdcnG6iNdKweAnq6LvgnkvuDWVkAFwywj" + "digest": "4LHstjfZQD885Hedg7trd3JZRLomEp1kg1XYrrG8J62L" } ] } @@ -65,7 +65,7 @@ Response: { "nodes": [ { "type": { - "repr": "0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::EventA<0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::T1>" + "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -78,7 +78,7 @@ Response: { }, { "type": { - "repr": "0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::EventA<0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::T2>" + "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T2>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -91,7 +91,7 @@ Response: { }, { "type": { - "repr": "0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::EventA<0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::T1>" + "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -104,7 +104,7 @@ Response: { }, { "type": { - "repr": "0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::EventA<0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::T2>" + "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T2>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -128,7 +128,7 @@ Response: { "nodes": [ { "type": { - "repr": "0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::EventA<0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::T1>" + "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -141,7 +141,7 @@ Response: { }, { "type": { - "repr": "0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::EventA<0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::T1>" + "repr": "0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::EventA<0x7e8ea8dea7457d536129c24c102f5c30684fe36adf5c87a5bad5be2ff7d00ae5::M1::T1>" }, "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" @@ -162,21 +162,7 @@ task 9, lines 80-95: Response: { "data": { "events": { - "nodes": [ - { - "type": { - "repr": "0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::EventA<0xf15189808de27b1c917c0f82626b69bf4a2fd46948f2e8e26f8af93634124cb2::M1::T2>" - }, - "sender": { - "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" - }, - "json": { - "value": { - "dummy_field": false - } - } - } - ] + "nodes": [] } } } diff --git a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp index e01ddb91d62..3a26175bed6 100644 --- a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp +++ b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp @@ -73,7 +73,7 @@ task 5, lines 59-63: //# run-graphql Response: { "data": { - "chainIdentifier": "e1d5137d" + "chainIdentifier": "e50daeb7" } } @@ -81,7 +81,7 @@ task 6, lines 65-69: //# run-graphql Response: { "data": { - "chainIdentifier": "e1d5137d" + "chainIdentifier": "e50daeb7" } } diff --git a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp index 16e0028a7a4..3df92edd511 100644 --- a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp +++ b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp @@ -30,7 +30,7 @@ Response: { "edges": [ { "node": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } } ] @@ -59,7 +59,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } } ] @@ -91,7 +91,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } } ] @@ -100,7 +100,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } } ] @@ -132,7 +132,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } } ] @@ -164,7 +164,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } } ] @@ -190,7 +190,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } } ] @@ -216,7 +216,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD", + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q", "first": null, "last": null } @@ -243,7 +243,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD", + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q", "first": null, "last": null } @@ -270,7 +270,7 @@ Response: { "edges": [ { "txns": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD", + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q", "a": null, "b": null } @@ -324,7 +324,7 @@ Response: { "edges": [ { "node": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD", + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q", "a": null } } @@ -350,14 +350,14 @@ Response: { "fragmentSpread": { "nodes": [ { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } ] }, "inlineFragment": { "nodes": [ { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp index 8cc58ebdd11..4b469acf639 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp @@ -21,9 +21,9 @@ Response: { "iotaCoins": { "edges": [ { - "cursor": "IBao6IhDn7hl4uu2XYkOhyvmcXQU9AHwebV0HmdGfKQcAQAAAAAAAAA=", + "cursor": "IDejnNtJDt+1jyfOdjn/AmGFmbJKC5F0/KuBPLyO8udXAQAAAAAAAAA=", "node": { - "coinBalance": "299999983336400", + "coinBalance": "300000000000000", "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" @@ -32,7 +32,7 @@ Response: { } }, { - "cursor": "IIz+6PGvwXCeVC7Vm0H9kJEMAsXnzlBZzrSz99JdySOdAQAAAAAAAAA=", + "cursor": "IDgbuPdj3DERVIhMGJwCcgQoCE4bFkx+/qB1PI67n6GpAQAAAAAAAAA=", "node": { "coinBalance": "30000000000000000", "contents": { @@ -43,20 +43,9 @@ Response: { } }, { - "cursor": "IJvawMH0VbgEh/ZtB0erXxE+/rzdAlj0WIt3JzjQs8sRAQAAAAAAAAA=", - "node": { - "coinBalance": "300000000000000", - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" - } - } - } - }, - { - "cursor": "IMY/VHoF610diL+S4rDBIGpW2PIF5LCX4kV0OZpMnPj3AQAAAAAAAAA=", + "cursor": "IFwSkvmC5PQWLWvaf5IXfTXG0M+7W1MXqRJp0GD7eqevAQAAAAAAAAA=", "node": { - "coinBalance": "30000000000000000", + "coinBalance": "299999983336400", "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" @@ -69,34 +58,34 @@ Response: { "fakeCoins": { "edges": [ { - "cursor": "IIg4QyiMWUOTVMNTmRkL1HIQr7k/z9dcG4oAetb6QjbGAQAAAAAAAAA=", + "cursor": "IFCto+HqZV+CA8GBbQb2iMg8le5if61nfX42FTETumcCAQAAAAAAAAA=", "node": { "coinBalance": "2", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x5427c77851d42bea4fbbfe56724d57756b843e2038f23785cef5b9559d01bef8::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE>" } } } }, { - "cursor": "IImP7Bx+qUUTyvUk5wSrKU90abCFrbzb0AfgLca4fyV7AQAAAAAAAAA=", + "cursor": "IFV0yl/uDtBt31BwG5TvuT3wC39K/QLYZR8CY2zz6fWiAQAAAAAAAAA=", "node": { - "coinBalance": "1", + "coinBalance": "3", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x5427c77851d42bea4fbbfe56724d57756b843e2038f23785cef5b9559d01bef8::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE>" } } } }, { - "cursor": "IJU3paGJOHPouEf9+iN6nqiqFacvNzEI//kR9mj6PQYiAQAAAAAAAAA=", + "cursor": "IGoY5Cxim76LrxXqiV10mZkP90+uEwSgkekjLUCbpHwbAQAAAAAAAAA=", "node": { - "coinBalance": "3", + "coinBalance": "1", "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x5427c77851d42bea4fbbfe56724d57756b843e2038f23785cef5b9559d01bef8::fake::FAKE>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE>" } } } @@ -107,7 +96,7 @@ Response: { "coins": { "edges": [ { - "cursor": "IBao6IhDn7hl4uu2XYkOhyvmcXQU9AHwebV0HmdGfKQcAQAAAAAAAAA=", + "cursor": "IFwSkvmC5PQWLWvaf5IXfTXG0M+7W1MXqRJp0GD7eqevAQAAAAAAAAA=", "node": { "coinBalance": "299999983336400", "contents": { @@ -132,10 +121,10 @@ Response: { } }, { - "cursor": "eyJ0IjoiMHg1NDI3Yzc3ODUxZDQyYmVhNGZiYmZlNTY3MjRkNTc3NTZiODQzZTIwMzhmMjM3ODVjZWY1Yjk1NTlkMDFiZWY4OjpmYWtlOjpGQUtFIiwiYyI6MX0", + "cursor": "eyJ0IjoiMHgyY2FhZDQxM2ZiNDZlOTk5NWNiNTQzMDlhZTcxYjI3NTQyZTliNDg4YmVlMzM0ZWYwNmI0YzdiNTVmNDI4MjQ0OjpmYWtlOjpGQUtFIiwiYyI6MX0", "node": { "coinType": { - "repr": "0x5427c77851d42bea4fbbfe56724d57756b843e2038f23785cef5b9559d01bef8::fake::FAKE" + "repr": "0x2caad413fb46e9995cb54309ae71b27542e9b488bee334ef06b4c7b55f428244::fake::FAKE" }, "coinObjectCount": 3, "totalBalance": "6" @@ -153,7 +142,7 @@ Response: { "lastBalance": { "edges": [ { - "cursor": "eyJ0IjoiMHg1NDI3Yzc3ODUxZDQyYmVhNGZiYmZlNTY3MjRkNTc3NTZiODQzZTIwMzhmMjM3ODVjZWY1Yjk1NTlkMDFiZWY4OjpmYWtlOjpGQUtFIiwiYyI6MX0" + "cursor": "eyJ0IjoiMHgyY2FhZDQxM2ZiNDZlOTk5NWNiNTQzMDlhZTcxYjI3NTQyZTliNDg4YmVlMzM0ZWYwNmI0YzdiNTVmNDI4MjQ0OjpmYWtlOjpGQUtFIiwiYyI6MX0" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/data.exp b/crates/iota-graphql-e2e-tests/tests/objects/data.exp index e9559c6c1ae..1f0d46d93da 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/data.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/data.exp @@ -44,38 +44,38 @@ Response: { "name": "id", "value": { "UID": [ - 155, - 218, - 192, - 193, - 244, - 85, - 184, - 4, - 135, - 246, - 109, - 7, - 71, + 55, + 163, + 156, + 219, + 73, + 14, + 223, + 181, + 143, + 39, + 206, + 118, + 57, + 255, + 2, + 97, + 133, + 153, + 178, + 74, + 11, + 145, + 116, + 252, 171, - 95, - 17, - 62, - 254, + 129, + 60, 188, - 221, - 2, - 88, - 244, - 88, - 139, - 119, - 39, - 56, - 208, - 179, - 203, - 17 + 142, + 242, + 231, + 87 ] } }, @@ -95,7 +95,7 @@ Response: { ] }, "json": { - "id": "0x9bdac0c1f455b80487f66d0747ab5f113efebcdd0258f4588b772738d0b3cb11", + "id": "0x37a39cdb490edfb58f27ce7639ff02618599b24a0b9174fcab813cbc8ef2e757", "balance": { "value": "299999988454400" } @@ -109,7 +109,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0xaac88efdf69f44a44633c28935fc8834a333cdd1372ae3f9b858eb897bb52c14::m::Foo" + "repr": "0xc215a5eb339690806ff0ed48ab6a08e3378593c49d809b4cbdaaadab8ce089e2::m::Foo" }, "data": { "Struct": [ @@ -117,38 +117,38 @@ Response: { "name": "id", "value": { "UID": [ - 222, - 16, - 127, - 78, - 164, + 170, + 104, + 165, + 190, 189, - 180, - 48, - 5, - 65, - 191, - 115, - 225, - 187, - 228, - 4, - 78, - 29, - 216, - 201, 12, - 74, - 221, - 186, - 81, - 50, - 245, - 14, - 57, - 227, - 96, - 40 + 236, + 125, + 250, + 29, + 35, + 7, + 134, + 66, + 125, + 140, + 205, + 66, + 59, + 114, + 206, + 204, + 177, + 155, + 246, + 42, + 111, + 233, + 169, + 83, + 26, + 154 ] } }, @@ -156,38 +156,38 @@ Response: { "name": "f0", "value": { "ID": [ - 222, - 16, - 127, - 78, - 164, + 170, + 104, + 165, + 190, 189, - 180, - 48, - 5, - 65, - 191, - 115, - 225, - 187, - 228, - 4, - 78, - 29, - 216, - 201, 12, - 74, - 221, - 186, - 81, - 50, - 245, - 14, - 57, - 227, - 96, - 40 + 236, + 125, + 250, + 29, + 35, + 7, + 134, + 66, + 125, + 140, + 205, + 66, + 59, + 114, + 206, + 204, + 177, + 155, + 246, + 42, + 111, + 233, + 169, + 83, + 26, + 154 ] } }, @@ -227,38 +227,38 @@ Response: { "Vector": [ { "Address": [ - 222, - 16, - 127, - 78, - 164, + 170, + 104, + 165, + 190, 189, - 180, - 48, - 5, - 65, - 191, - 115, - 225, - 187, - 228, - 4, - 78, - 29, - 216, - 201, 12, - 74, - 221, - 186, - 81, - 50, - 245, - 14, - 57, - 227, - 96, - 40 + 236, + 125, + 250, + 29, + 35, + 7, + 134, + 66, + 125, + 140, + 205, + 66, + 59, + 114, + 206, + 204, + 177, + 155, + 246, + 42, + 111, + 233, + 169, + 83, + 26, + 154 ] } ] @@ -275,15 +275,15 @@ Response: { ] }, "json": { - "id": "0xde107f4ea4bdb4300541bf73e1bbe4044e1dd8c90c4addba5132f50e39e36028", - "f0": "0xde107f4ea4bdb4300541bf73e1bbe4044e1dd8c90c4addba5132f50e39e36028", + "id": "0xaa68a5bebd0cec7dfa1d230786427d8ccd423b72ceccb19bf62a6fe9a9531a9a", + "f0": "0xaa68a5bebd0cec7dfa1d230786427d8ccd423b72ceccb19bf62a6fe9a9531a9a", "f1": true, "f2": 42, "f3": "43", "f4": "hello", "f5": "world", "f6": [ - "0xde107f4ea4bdb4300541bf73e1bbe4044e1dd8c90c4addba5132f50e39e36028" + "0xaa68a5bebd0cec7dfa1d230786427d8ccd423b72ceccb19bf62a6fe9a9531a9a" ], "f7": 44 } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/display.exp b/crates/iota-graphql-e2e-tests/tests/objects/display.exp index 55af5c6afcf..7941b8b3129 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/display.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/display.exp @@ -5,7 +5,7 @@ A: object(0,0) task 1, lines 7-131: //# publish --sender A -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [91, 12, 10, 43, 119, 160, 47, 175, 213, 37, 57, 38, 91, 66, 168, 83, 130, 247, 170, 150, 13, 25, 185, 175, 7, 21, 197, 128, 93, 72, 108, 33] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245] } created: object(1,0), object(1,1), object(1,2) mutated: object(0,0) gas summary: computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 @@ -16,7 +16,7 @@ Checkpoint created: 1 task 3, line 135: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 1, content_digest: DbUNZNH3kBMZDctWEPfNqahnKKDU2AQAm2JuXameKnri, +CheckpointSummary { epoch: 0, seq: 1, content_digest: DxfuAPNDXR3iEjnafeAcqMdMmZaUKvkpomSmuuWYyE4o, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 }} task 4, line 137: @@ -27,7 +27,7 @@ gas summary: computation_cost: 1000000, storage_cost: 3556800, storage_rebate: task 5, line 139: //# run Test::boars::update_display_faulty --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [91, 12, 10, 43, 119, 160, 47, 175, 213, 37, 57, 38, 91, 66, 168, 83, 130, 247, 170, 150, 13, 25, 185, 175, 7, 21, 197, 128, 93, 72, 108, 33, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 2941200, storage_rebate: 2652400, non_refundable_storage_fee: 0 @@ -37,7 +37,7 @@ Checkpoint created: 2 task 7, line 143: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 2, content_digest: AXoLpv4nzVNNQWqZZDvvErHqqZ7inju4FDZHfXxs2WH3, +CheckpointSummary { epoch: 0, seq: 2, content_digest: 2Q2Sh3RdhFkt4XKHPSMoX4ZUfVyY7eFdJuAi6HJHgcUf, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 3000000, storage_cost: 27968000, storage_rebate: 3640400, non_refundable_storage_fee: 0 }} task 8, lines 145-158: @@ -74,7 +74,7 @@ Response: { task 9, line 160: //# run Test::boars::single_add --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [91, 12, 10, 43, 119, 160, 47, 175, 213, 37, 57, 38, 91, 66, 168, 83, 130, 247, 170, 150, 13, 25, 185, 175, 7, 21, 197, 128, 93, 72, 108, 33, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 3032400, storage_rebate: 2941200, non_refundable_storage_fee: 0 @@ -84,7 +84,7 @@ Checkpoint created: 3 task 11, line 164: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 3, content_digest: 2BVqD56hZGPtPBg9bBdVJ9mrZNd2DStiCLKncnedfDEH, +CheckpointSummary { epoch: 0, seq: 3, content_digest: ApFyo1y4BfPaE3yHs2oSoCTgzUxmyAuzENCud6jPRvm6, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 4000000, storage_cost: 31000400, storage_rebate: 6581600, non_refundable_storage_fee: 0 }} task 12, lines 166-179: @@ -126,7 +126,7 @@ Response: { task 13, line 181: //# run Test::boars::multi_add --sender A --args object(1,1) -events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [91, 12, 10, 43, 119, 160, 47, 175, 213, 37, 57, 38, 91, 66, 168, 83, 130, 247, 170, 150, 13, 25, 185, 175, 7, 21, 197, 128, 93, 72, 108, 33, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] } +events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [200, 150, 132, 71, 202, 137, 3, 87, 222, 224, 67, 232, 54, 156, 171, 125, 11, 72, 193, 0, 129, 141, 189, 40, 19, 179, 119, 175, 62, 234, 214, 245, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] } mutated: object(0,0), object(1,1) gas summary: computation_cost: 1000000, storage_cost: 5236400, storage_rebate: 3032400, non_refundable_storage_fee: 0 @@ -136,7 +136,7 @@ Checkpoint created: 4 task 15, line 185: //# view-checkpoint -CheckpointSummary { epoch: 0, seq: 4, content_digest: EmMrLtLuyYesFUFnrqSgjozhxxtc4i5cyW1GE24TpqY5, +CheckpointSummary { epoch: 0, seq: 4, content_digest: 6fCKEnhwLRw8bcXBko1NumBU4z5ngG7Xtx5LXMTe8yY5, epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 5000000, storage_cost: 36236800, storage_rebate: 9614000, non_refundable_storage_fee: 0 }} task 16, lines 187-200: @@ -195,7 +195,7 @@ Response: { }, { "key": "project_url", - "value": "Unique Boar from the Boars collection with First Boar and 0x1d14b05a0e4de04a366be5fb238a260b319e94a986a953f31ab9e0284fb0ca61", + "value": "Unique Boar from the Boars collection with First Boar and 0x9fdaf1c274354cbe0b3a6e0a13aa73c31941f73a54fbe72e84a077ddac456063", "error": null }, { diff --git a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp index 6138279f370..e6a8ee29748 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp @@ -44,38 +44,38 @@ Response: { "name": "id", "value": { "UID": [ - 155, - 218, - 192, - 193, - 244, - 85, - 184, - 4, - 135, - 246, - 109, - 7, - 71, + 55, + 163, + 156, + 219, + 73, + 14, + 223, + 181, + 143, + 39, + 206, + 118, + 57, + 255, + 2, + 97, + 133, + 153, + 178, + 74, + 11, + 145, + 116, + 252, 171, - 95, - 17, - 62, - 254, + 129, + 60, 188, - 221, - 2, - 88, - 244, - 88, - 139, - 119, - 39, - 56, - 208, - 179, - 203, - 17 + 142, + 242, + 231, + 87 ] } }, @@ -95,7 +95,7 @@ Response: { ] }, "json": { - "id": "0x9bdac0c1f455b80487f66d0747ab5f113efebcdd0258f4588b772738d0b3cb11", + "id": "0x37a39cdb490edfb58f27ce7639ff02618599b24a0b9174fcab813cbc8ef2e757", "balance": { "value": "299999995967600" } @@ -109,7 +109,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x66ec5f38cce33a6aeba11afe550856c87f6b57c585b69e14f0311447d5820c73::m::Foo" + "repr": "0xc169e760953e68805694f335ddbbfed580aa64864113acd7c81f9f4e34975ab6::m::Foo" }, "data": { "Struct": [ @@ -117,38 +117,38 @@ Response: { "name": "id", "value": { "UID": [ + 126, + 19, + 31, + 228, + 156, + 97, + 224, + 21, + 90, + 63, 185, - 241, - 144, - 30, - 249, - 175, - 178, + 127, + 37, 209, - 182, - 91, - 235, - 220, - 70, - 222, + 203, + 64, + 51, + 51, + 124, + 104, + 128, + 92, 101, - 82, - 67, 126, - 38, - 215, - 113, - 183, - 75, - 12, - 89, - 242, - 129, - 117, - 237, - 39, - 184, - 165 + 85, + 214, + 252, + 96, + 203, + 24, + 107, + 104 ] } }, @@ -156,38 +156,38 @@ Response: { "name": "f0", "value": { "ID": [ + 126, + 19, + 31, + 228, + 156, + 97, + 224, + 21, + 90, + 63, 185, - 241, - 144, - 30, - 249, - 175, - 178, + 127, + 37, 209, - 182, - 91, - 235, - 220, - 70, - 222, + 203, + 64, + 51, + 51, + 124, + 104, + 128, + 92, 101, - 82, - 67, 126, - 38, - 215, - 113, - 183, - 75, - 12, - 89, - 242, - 129, - 117, - 237, - 39, - 184, - 165 + 85, + 214, + 252, + 96, + 203, + 24, + 107, + 104 ] } }, @@ -227,38 +227,38 @@ Response: { "Vector": [ { "Address": [ + 126, + 19, + 31, + 228, + 156, + 97, + 224, + 21, + 90, + 63, 185, - 241, - 144, - 30, - 249, - 175, - 178, + 127, + 37, 209, - 182, - 91, - 235, - 220, - 70, - 222, + 203, + 64, + 51, + 51, + 124, + 104, + 128, + 92, 101, - 82, - 67, 126, - 38, - 215, - 113, - 183, - 75, - 12, - 89, - 242, - 129, - 117, - 237, - 39, - 184, - 165 + 85, + 214, + 252, + 96, + 203, + 24, + 107, + 104 ] } ] @@ -325,15 +325,15 @@ Response: { ] }, "json": { - "id": "0xb9f1901ef9afb2d1b65bebdc46de6552437e26d771b74b0c59f28175ed27b8a5", - "f0": "0xb9f1901ef9afb2d1b65bebdc46de6552437e26d771b74b0c59f28175ed27b8a5", + "id": "0x7e131fe49c61e0155a3fb97f25d1cb4033337c68805c657e55d6fc60cb186b68", + "f0": "0x7e131fe49c61e0155a3fb97f25d1cb4033337c68805c657e55d6fc60cb186b68", "f1": true, "f2": 42, "f3": "43", "f4": "hello", "f5": "world", "f6": [ - "0xb9f1901ef9afb2d1b65bebdc46de6552437e26d771b74b0c59f28175ed27b8a5" + "0x7e131fe49c61e0155a3fb97f25d1cb4033337c68805c657e55d6fc60cb186b68" ], "f7": 44, "f8": { diff --git a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp index 7990444fe3f..f77876181b8 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp @@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 4, lines 16-18: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [171, 56, 174, 116, 116, 231, 90, 122, 148, 80, 189, 213, 3, 8, 47, 190, 80, 171, 87, 32, 84, 9, 231, 203, 82, 3, 186, 181, 58, 235, 194, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } created: object(4,0) mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) deleted: object(3,0) @@ -134,29 +134,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" - } - } - } - } - }, - { - "node": { - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" - } - } - } - } - }, - { - "node": { - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -178,7 +156,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -200,7 +178,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>" } } } @@ -211,7 +189,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -222,7 +200,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" } } } @@ -233,7 +211,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -255,7 +233,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" } } } @@ -266,7 +244,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" } } } @@ -277,7 +255,7 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp index 1c7b0508d36..4da0d38ba55 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp @@ -48,19 +48,19 @@ Response: { "objects": { "edges": [ { - "cursor": "ICtsolfhSs84dlGvOImwI5jzXXQu2djMTh/gQQJgahXGAQAAAAAAAAA=" + "cursor": "ICz5IIuKI6+mzOyxS7vkE/oGAnCaqEDXuBATCd5LC5QvAQAAAAAAAAA=" }, { - "cursor": "IIt71raxnB/0N0g4+DWkvYCE3zMwk/e4DvXm1zFlJwt0AQAAAAAAAAA=" + "cursor": "IE/xhbQKpM+NlTQZ438Fzeh/2sIYYDkqr2aI4OBK3c4xAQAAAAAAAAA=" }, { - "cursor": "II5CZZLbHHjpLgtfdPqwkekv/h4PbtW2t3jDYeM1OLloAQAAAAAAAAA=" + "cursor": "IGHtIXjzidfc4B0Zn7TKECtr9BEfkMb34vC1w8RZgbDxAQAAAAAAAAA=" }, { - "cursor": "IJlUozzGeAqyGOEW+M5AEBV7mSeyEPC82WBdwBQh7krzAQAAAAAAAAA=" + "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA=" }, { - "cursor": "IJsn9ZEZnNXewi7e86kFfZssa+oH496dRRxZR/uo6X0ZAQAAAAAAAAA=" + "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA=" } ] } @@ -76,10 +76,10 @@ Response: { "objects": { "edges": [ { - "cursor": "ICtsolfhSs84dlGvOImwI5jzXXQu2djMTh/gQQJgahXGAQAAAAAAAAA=" + "cursor": "ICz5IIuKI6+mzOyxS7vkE/oGAnCaqEDXuBATCd5LC5QvAQAAAAAAAAA=" }, { - "cursor": "IIt71raxnB/0N0g4+DWkvYCE3zMwk/e4DvXm1zFlJwt0AQAAAAAAAAA=" + "cursor": "IE/xhbQKpM+NlTQZ438Fzeh/2sIYYDkqr2aI4OBK3c4xAQAAAAAAAAA=" } ] } @@ -95,52 +95,52 @@ Response: { "objects": { "edges": [ { - "cursor": "ICtsolfhSs84dlGvOImwI5jzXXQu2djMTh/gQQJgahXGAQAAAAAAAAA=", + "cursor": "ICz5IIuKI6+mzOyxS7vkE/oGAnCaqEDXuBATCd5LC5QvAQAAAAAAAAA=", "node": { - "address": "0x2b6ca257e14acf387651af3889b02398f35d742ed9d8cc4e1fe04102606a15c6" + "address": "0x2cf9208b8a23afa6ccecb14bbbe413fa0602709aa840d7b8101309de4b0b942f" } }, { - "cursor": "IIt71raxnB/0N0g4+DWkvYCE3zMwk/e4DvXm1zFlJwt0AQAAAAAAAAA=", + "cursor": "IE/xhbQKpM+NlTQZ438Fzeh/2sIYYDkqr2aI4OBK3c4xAQAAAAAAAAA=", "node": { - "address": "0x8b7bd6b6b19c1ff4374838f835a4bd8084df333093f7b80ef5e6d73165270b74" + "address": "0x4ff185b40aa4cf8d953419e37f05cde87fdac21860392aaf6688e0e04addce31" } }, { - "cursor": "II5CZZLbHHjpLgtfdPqwkekv/h4PbtW2t3jDYeM1OLloAQAAAAAAAAA=", + "cursor": "IGHtIXjzidfc4B0Zn7TKECtr9BEfkMb34vC1w8RZgbDxAQAAAAAAAAA=", "node": { - "address": "0x8e426592db1c78e92e0b5f74fab091e92ffe1e0f6ed5b6b778c361e33538b968" + "address": "0x61ed2178f389d7dce01d199fb4ca102b6bf4111f90c6f7e2f0b5c3c45981b0f1" } }, { - "cursor": "IJlUozzGeAqyGOEW+M5AEBV7mSeyEPC82WBdwBQh7krzAQAAAAAAAAA=", + "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA=", "node": { - "address": "0x9954a33cc6780ab218e116f8ce4010157b9927b210f0bcd9605dc01421ee4af3" + "address": "0x6c659208355e7ed574fc78ded5f426d996811f88951f622f876c1d10658bfc26" } }, { - "cursor": "IJsn9ZEZnNXewi7e86kFfZssa+oH496dRRxZR/uo6X0ZAQAAAAAAAAA=", + "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA=", "node": { - "address": "0x9b27f591199cd5dec22edef3a9057d9b2c6bea07e3de9d451c5947fba8e97d19" + "address": "0xa88ee17fe99416a40062c1f45e6dc621a7fc7489198e57484451f11ef1f23913" } } ] } }, "obj_3_0": { - "address": "0x8b7bd6b6b19c1ff4374838f835a4bd8084df333093f7b80ef5e6d73165270b74" + "address": "0x2cf9208b8a23afa6ccecb14bbbe413fa0602709aa840d7b8101309de4b0b942f" }, "obj_5_0": { - "address": "0x9954a33cc6780ab218e116f8ce4010157b9927b210f0bcd9605dc01421ee4af3" + "address": "0x61ed2178f389d7dce01d199fb4ca102b6bf4111f90c6f7e2f0b5c3c45981b0f1" }, "obj_6_0": { - "address": "0x9b27f591199cd5dec22edef3a9057d9b2c6bea07e3de9d451c5947fba8e97d19" + "address": "0x4ff185b40aa4cf8d953419e37f05cde87fdac21860392aaf6688e0e04addce31" }, "obj_4_0": { - "address": "0x8e426592db1c78e92e0b5f74fab091e92ffe1e0f6ed5b6b778c361e33538b968" + "address": "0x6c659208355e7ed574fc78ded5f426d996811f88951f622f876c1d10658bfc26" }, "obj_2_0": { - "address": "0x2b6ca257e14acf387651af3889b02398f35d742ed9d8cc4e1fe04102606a15c6" + "address": "0xa88ee17fe99416a40062c1f45e6dc621a7fc7489198e57484451f11ef1f23913" } } } @@ -153,7 +153,10 @@ Response: { "objects": { "edges": [ { - "cursor": "IJsn9ZEZnNXewi7e86kFfZssa+oH496dRRxZR/uo6X0ZAQAAAAAAAAA=" + "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA=" + }, + { + "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA=" } ] } @@ -169,7 +172,7 @@ Response: { "objects": { "edges": [ { - "cursor": "IJlUozzGeAqyGOEW+M5AEBV7mSeyEPC82WBdwBQh7krzAQAAAAAAAAA=" + "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA=" } ] } @@ -183,11 +186,7 @@ Response: { "data": { "address": { "objects": { - "edges": [ - { - "cursor": "ICtsolfhSs84dlGvOImwI5jzXXQu2djMTh/gQQJgahXGAQAAAAAAAAA=" - } - ] + "edges": [] } } } @@ -201,15 +200,15 @@ Response: { "objects": { "edges": [ { - "cursor": "IJlUozzGeAqyGOEW+M5AEBV7mSeyEPC82WBdwBQh7krzAQAAAAAAAAA=", + "cursor": "IGxlkgg1Xn7VdPx43tX0JtmWgR+IlR9iL4dsHRBli/wmAQAAAAAAAAA=", "node": { - "address": "0x9954a33cc6780ab218e116f8ce4010157b9927b210f0bcd9605dc01421ee4af3" + "address": "0x6c659208355e7ed574fc78ded5f426d996811f88951f622f876c1d10658bfc26" } }, { - "cursor": "IJsn9ZEZnNXewi7e86kFfZssa+oH496dRRxZR/uo6X0ZAQAAAAAAAAA=", + "cursor": "IKiO4X/plBakAGLB9F5txiGn/HSJGY5XSERR8R7x8jkTAQAAAAAAAAA=", "node": { - "address": "0x9b27f591199cd5dec22edef3a9057d9b2c6bea07e3de9d451c5947fba8e97d19" + "address": "0xa88ee17fe99416a40062c1f45e6dc621a7fc7489198e57484451f11ef1f23913" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp index 59da6a2004d..8a47d32ffcf 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp @@ -37,10 +37,10 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x24c656fc76e9147ca76a3d20b7933a417a10714e9c32360ba95aaac0407d6a7b::m::Foo" + "repr": "0xe5b2eaebcea299e2a55ee5d2daebb15e71f47ed83ea0e9702359e55f26a6da0d::m::Bar" } }, - "hasPublicTransfer": true + "hasPublicTransfer": false } } }, @@ -61,10 +61,10 @@ Response: { "asMoveObject": { "contents": { "type": { - "repr": "0x24c656fc76e9147ca76a3d20b7933a417a10714e9c32360ba95aaac0407d6a7b::m::Bar" + "repr": "0xe5b2eaebcea299e2a55ee5d2daebb15e71f47ed83ea0e9702359e55f26a6da0d::m::Foo" } }, - "hasPublicTransfer": false + "hasPublicTransfer": true } } } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/received.exp b/crates/iota-graphql-e2e-tests/tests/objects/received.exp index ccd85baf2ed..649207f54ac 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/received.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/received.exp @@ -30,7 +30,7 @@ Response: { "receivedTransactionBlocks": { "nodes": [ { - "digest": "HKYdrd3SigjtyshocUcpngqrcEHd5bLE7a5PuqopsEp6" + "digest": "BpQiF9UpsqLzSanNFGVvRXjcn5nPVUukaiQiRZFKXkEn" } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp index 2d4889f4994..5656d2d4726 100644 --- a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp +++ b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp @@ -10,7 +10,7 @@ Response: { "objects": { "edges": [ { - "cursor": "IL6XFugQ26bu+xGPneNsvxIrMLQoA3owT5H4f3zHNuXIAAAAAAAAAAA=", + "cursor": "IFH/uNA0p9hgv8vtgPYPhPx5vPpLjK+laCIv3sJLgxmZAAAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { @@ -39,11 +39,11 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000, storage_rebate: task 3, line 38: //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C -events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [171, 56, 174, 116, 116, 231, 90, 122, 148, 80, 189, 213, 3, 8, 47, 190, 80, 171, 87, 32, 84, 9, 231, 203, 82, 3, 186, 181, 58, 235, 194, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } -created: object(3,0), object(3,1) -mutated: 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) -deleted: object(_), object(2,0) -gas summary: computation_cost: 1000000, storage_cost: 14561600, storage_rebate: 1976000, non_refundable_storage_fee: 0 +events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [135, 213, 224, 32, 91, 207, 0, 187, 34, 183, 14, 41, 167, 78, 77, 75, 138, 89, 173, 167, 170, 11, 38, 100, 45, 178, 245, 162, 113, 72, 177, 240, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] } +created: object(3,0) +mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0) +deleted: object(2,0) +gas summary: computation_cost: 1000000, storage_cost: 14523600, storage_rebate: 1976000, non_refundable_storage_fee: 0 task 4, line 40: //# create-checkpoint @@ -60,23 +60,23 @@ Response: { "objects": { "edges": [ { - "cursor": "ICyVnatyIW8BBQyropcZeyQEQxpFiSDIk5mD/WFlco2wAgAAAAAAAAA=", + "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdAgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { "principal": "10000000000", - "poolId": "0xab38ae7474e75a7a9450bdd503082fbe50ab57205409e7cb5203bab53aebc201" + "poolId": "0x87d5e0205bcf00bb22b70e29a74e4d4b8a59ada7aa0b26642db2f5a27148b1f0" } } } }, { - "cursor": "IL6XFugQ26bu+xGPneNsvxIrMLQoA3owT5H4f3zHNuXIAgAAAAAAAAA=", + "cursor": "IFH/uNA0p9hgv8vtgPYPhPx5vPpLjK+laCIv3sJLgxmZAgAAAAAAAAA=", "node": { "asMoveObject": { "asStakedIota": { "principal": "1500000000000000", - "poolId": "0xab38ae7474e75a7a9450bdd503082fbe50ab57205409e7cb5203bab53aebc201" + "poolId": "0x87d5e0205bcf00bb22b70e29a74e4d4b8a59ada7aa0b26642db2f5a27148b1f0" } } } @@ -87,7 +87,7 @@ Response: { "asMoveObject": { "asStakedIota": { "principal": "15340000000000", - "poolId": "0xab38ae7474e75a7a9450bdd503082fbe50ab57205409e7cb5203bab53aebc201" + "poolId": "0x87d5e0205bcf00bb22b70e29a74e4d4b8a59ada7aa0b26642db2f5a27148b1f0" } } } @@ -98,7 +98,7 @@ Response: { "stakedIotas": { "edges": [ { - "cursor": "ICyVnatyIW8BBQyropcZeyQEQxpFiSDIk5mD/WFlco2wAgAAAAAAAAA=", + "cursor": "IBI4Fo2NYBQFmwjdXvYZPRT977qOK/lqUGGG1hDgb5pdAgAAAAAAAAA=", "node": { "principal": "10000000000" } diff --git a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp index 9128df7e650..29fa37b8ea8 100644 --- a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp +++ b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp @@ -24,7 +24,7 @@ Response: { }, "coin": { "asObject": { - "digest": "5vRWjBz8CXM1nbBRud4xQLkHPa5hUfomnTs2Vbc6PruV" + "digest": "DFtexsvNVh4PmwAiXnx9kSN976yuTwfcScCVFSWttNpb" } } } diff --git a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp index 07ae68efadb..2b944182393 100644 --- a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp +++ b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp @@ -124,10 +124,10 @@ Response: { "version": 11, "contents": { "json": { - "id": "0x7f25c843015b0ca01a7bb3d5c433ed7a925ebf816889a33039b4c01ef1d57a55", + "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887", "count": "1", "wrapped": { - "id": "0x18000440516999a85b3bdf516c720df29f7a858360de51f4178a7232f5460cdc", + "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8", "count": "1" } } @@ -141,10 +141,10 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x7f25c843015b0ca01a7bb3d5c433ed7a925ebf816889a33039b4c01ef1d57a55", + "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887", "count": "1", "wrapped": { - "id": "0x18000440516999a85b3bdf516c720df29f7a858360de51f4178a7232f5460cdc", + "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8", "count": "1" } } @@ -158,10 +158,10 @@ Response: { "version": 8, "contents": { "json": { - "id": "0x7f25c843015b0ca01a7bb3d5c433ed7a925ebf816889a33039b4c01ef1d57a55", + "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887", "count": "1", "wrapped": { - "id": "0x18000440516999a85b3bdf516c720df29f7a858360de51f4178a7232f5460cdc", + "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8", "count": "0" } } @@ -175,10 +175,10 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x7f25c843015b0ca01a7bb3d5c433ed7a925ebf816889a33039b4c01ef1d57a55", + "id": "0xdadd6b40653df07306e4bbd806c5d91cdfd309e195e5c4247e8583dafd5d4887", "count": "0", "wrapped": { - "id": "0x18000440516999a85b3bdf516c720df29f7a858360de51f4178a7232f5460cdc", + "id": "0x5d4aba4106cbb800784bc62b281859da27d7f76dc232970dc09af09773b146f8", "count": "0" } } @@ -199,7 +199,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x521959664b50a297d21c5d2adca1265cf0fceecdc1082262335b9fb681294d99", + "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c", "count": "0" } } @@ -212,7 +212,7 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x521959664b50a297d21c5d2adca1265cf0fceecdc1082262335b9fb681294d99", + "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c", "count": "1" } } @@ -225,7 +225,7 @@ Response: { "version": 10, "contents": { "json": { - "id": "0x521959664b50a297d21c5d2adca1265cf0fceecdc1082262335b9fb681294d99", + "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c", "count": "1" } } @@ -238,7 +238,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x521959664b50a297d21c5d2adca1265cf0fceecdc1082262335b9fb681294d99", + "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c", "count": "0" } } @@ -251,7 +251,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x521959664b50a297d21c5d2adca1265cf0fceecdc1082262335b9fb681294d99", + "id": "0xa7c0ba87883d6f3a62e844b3a0dd06063d2e2ae5cc2cd5fb51552cab1e91fa9c", "count": "0" } } @@ -271,7 +271,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x89fde96c1fe78bfc82af2bdaeba88cf217b22cb5574d6472080033d2c40ff796", + "id": "0xe29b50f8b9200699909adda56f8879b2423ccd71f8ce52834b5f411d07245094", "count": "0" } } @@ -284,7 +284,7 @@ Response: { "version": 11, "contents": { "json": { - "id": "0x89fde96c1fe78bfc82af2bdaeba88cf217b22cb5574d6472080033d2c40ff796", + "id": "0xe29b50f8b9200699909adda56f8879b2423ccd71f8ce52834b5f411d07245094", "count": "1" } } @@ -297,7 +297,7 @@ Response: { "version": 7, "contents": { "json": { - "id": "0x89fde96c1fe78bfc82af2bdaeba88cf217b22cb5574d6472080033d2c40ff796", + "id": "0xe29b50f8b9200699909adda56f8879b2423ccd71f8ce52834b5f411d07245094", "count": "0" } } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp index b747718aa6d..1344bdab0eb 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp @@ -155,7 +155,7 @@ task 5, lines 73-97: Response: { "data": { "object": { - "address": "0x5ce5f3dd044a95427557b25105b6970a0d777788331b6805c0b444d7c984c5c5", + "address": "0x84bade4e1affc5ca662106640dd8d01946dc34586f44685ee43bb9e8f7745491", "asMovePackage": { "module": { "datatypes": { @@ -190,7 +190,7 @@ task 6, lines 99-144: Response: { "data": { "object": { - "address": "0x5ce5f3dd044a95427557b25105b6970a0d777788331b6805c0b444d7c984c5c5", + "address": "0x84bade4e1affc5ca662106640dd8d01946dc34586f44685ee43bb9e8f7745491", "asMovePackage": { "module": { "datatypes": { diff --git a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp index e521f6045ad..817b0132c97 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp @@ -25,19 +25,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", + "address": "0x5c053df0f3ff451996d97f922275b6b12236fbb823340f82c46a83bd7ecc32ac", "asMovePackage": null } }, { "outputState": { - "address": "0x88753f8821c7d5b8e634264999e593f39e15cb68e4814abd86a995e8c88746e9", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "asMovePackage": null } }, { "outputState": { - "address": "0xdc6634b155a40eb697bff23f384ba7e04a70a9772e88c44ba983327437c66db6", + "address": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0", "asMovePackage": { "module": { "enum": { @@ -125,19 +125,13 @@ Response: { "nodes": [ { "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x4f420f2f6ae06a6f316000f71001cd4de755380770f0a31ff05c77b9f753875c", + "address": "0x249e61be7cd170f441f4496b19a5c5fe6ba62c2da158d464822c736f48c30b13", "asMovePackage": { "module": { "s": { "module": { "package": { - "address": "0xdc6634b155a40eb697bff23f384ba7e04a70a9772e88c44ba983327437c66db6" + "address": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0" } }, "name": "S", @@ -192,7 +186,7 @@ Response: { "t": { "module": { "package": { - "address": "0x4f420f2f6ae06a6f316000f71001cd4de755380770f0a31ff05c77b9f753875c" + "address": "0x249e61be7cd170f441f4496b19a5c5fe6ba62c2da158d464822c736f48c30b13" } }, "name": "T", @@ -222,12 +216,12 @@ Response: { { "name": "s", "type": { - "repr": "0xdc6634b155a40eb697bff23f384ba7e04a70a9772e88c44ba983327437c66db6::m::S", + "repr": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0::m::S", "signature": { "ref": null, "body": { "datatype": { - "package": "0xdc6634b155a40eb697bff23f384ba7e04a70a9772e88c44ba983327437c66db6", + "package": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0", "module": "m", "type": "S", "typeParameters": [] @@ -261,7 +255,7 @@ Response: { { "name": "t", "type": { - "repr": "0xdc6634b155a40eb697bff23f384ba7e04a70a9772e88c44ba983327437c66db6::m::T<0xdc6634b155a40eb697bff23f384ba7e04a70a9772e88c44ba983327437c66db6::m::S>" + "repr": "0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0::m::T<0xf6c427b747bb3014e8773e17875f8948c8b328380c5093de76524dfbda4888a0::m::S>" } } ] @@ -274,7 +268,13 @@ Response: { }, { "outputState": { - "address": "0x88753f8821c7d5b8e634264999e593f39e15cb68e4814abd86a995e8c88746e9", + "address": "0x5c053df0f3ff451996d97f922275b6b12236fbb823340f82c46a83bd7ecc32ac", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "asMovePackage": null } } @@ -297,11 +297,6 @@ Response: { "effects": { "objectChanges": { "nodes": [ - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -322,6 +317,11 @@ Response: { } } }, + { + "outputState": { + "asMovePackage": null + } + }, { "outputState": { "asMovePackage": null diff --git a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp index 15a638362f5..579783ff716 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp @@ -23,16 +23,6 @@ Response: { "effects": { "objectChanges": { "nodes": [ - { - "outputState": { - "asMovePackage": null - } - }, - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -106,6 +96,16 @@ Response: { } } } + }, + { + "outputState": { + "asMovePackage": null + } + }, + { + "outputState": { + "asMovePackage": null + } } ] } @@ -140,9 +140,7 @@ Response: { }, { "outputState": { - "asMovePackage": { - "module": null - } + "asMovePackage": null } } ] @@ -168,7 +166,7 @@ Response: { "effects", "objectChanges", "nodes", - 2, + 0, "outputState", "asMovePackage", "module", @@ -191,16 +189,6 @@ Response: { "effects": { "objectChanges": { "nodes": [ - { - "outputState": { - "asMovePackage": null - } - }, - { - "outputState": { - "asMovePackage": null - } - }, { "outputState": { "asMovePackage": { @@ -276,6 +264,16 @@ Response: { } } } + }, + { + "outputState": { + "asMovePackage": null + } + }, + { + "outputState": { + "asMovePackage": null + } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp index 58481617aa2..7c560a5a2be 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp @@ -95,19 +95,13 @@ Response: { "nodes": [ { "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0x4f02b282959db3d0b3c34ee9be4bd8e39023b8cf1a1a069e14325e650672b480", + "address": "0x143c64eb9d9ba9a32499ffa73ffd8da7d72b21706889c058ca4f71e0d30f2e1f", "asMovePackage": { "module": { "function": { "module": { "package": { - "address": "0x4f02b282959db3d0b3c34ee9be4bd8e39023b8cf1a1a069e14325e650672b480" + "address": "0x143c64eb9d9ba9a32499ffa73ffd8da7d72b21706889c058ca4f71e0d30f2e1f" } }, "name": "f", @@ -140,7 +134,13 @@ Response: { }, { "outputState": { - "address": "0xd3ca42aff193387adecc01129e9e6444616c5d57c065e118dbff9e7e0d3f6f96", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0x96f187369f9ad2d57c174ff79d8f830291b8e0288ac452c880366143fd1a69b8", "asMovePackage": null } } @@ -175,19 +175,25 @@ Response: { "nodes": [ { "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "asMovePackage": null } }, { "outputState": { - "address": "0x40aee5b33d9247ebd2df3db5644ee494dff36c45c2fd6b550e9a0701bf9f00f6", + "address": "0x96f187369f9ad2d57c174ff79d8f830291b8e0288ac452c880366143fd1a69b8", + "asMovePackage": null + } + }, + { + "outputState": { + "address": "0xac73467442fd42c2afe65f52bc3011c63f887fbbe0d41ce241c5b5be43c706b2", "asMovePackage": { "module": { "f": { "module": { "package": { - "address": "0x40aee5b33d9247ebd2df3db5644ee494dff36c45c2fd6b550e9a0701bf9f00f6" + "address": "0xac73467442fd42c2afe65f52bc3011c63f887fbbe0d41ce241c5b5be43c706b2" } }, "name": "f", @@ -217,7 +223,7 @@ Response: { "g": { "module": { "package": { - "address": "0x40aee5b33d9247ebd2df3db5644ee494dff36c45c2fd6b550e9a0701bf9f00f6" + "address": "0xac73467442fd42c2afe65f52bc3011c63f887fbbe0d41ce241c5b5be43c706b2" } }, "name": "g", @@ -234,12 +240,6 @@ Response: { } } } - }, - { - "outputState": { - "address": "0xd3ca42aff193387adecc01129e9e6444616c5d57c065e118dbff9e7e0d3f6f96", - "asMovePackage": null - } } ] } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp index 60291c7367e..18857f26ed4 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp @@ -22,23 +22,23 @@ Response: { "nodes": [ { "outputState": { - "address": "0x00abce450bda0ce7092d4c8930eaedf884ee0cb4584bf840e8f8950aa50de247", + "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20", "asMovePackage": { "module": { "name": "m", "package": { - "address": "0x00abce450bda0ce7092d4c8930eaedf884ee0cb4584bf840e8f8950aa50de247" + "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20" }, "fileFormatVersion": 6, - "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVlAKvORQvaDOcJLUyJMOrt+ITuDLRYS/hA6PiVCqUN4kcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=", - "disassembly": "// Move bytecode v6\nmodule abce450bda0ce7092d4c8930eaedf884ee0cb4584bf840e8f8950aa50de247.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo(Arg0: u64, Arg1: &Coin): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin)\n\t1: Call coin::value(&Coin): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin)\n\t2: Call foo(u64, &Coin): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin)\n\t5: Call foo(u64, &Coin): u64\n\t6: Mul\n\t7: Ret\n\n}\n}" + "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVlccnKvJNsOo9NcTV1wkVZgsA+W/Cs0fay7mS++s9mniAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=", + "disassembly": "// Move bytecode v6\nmodule 71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo(Arg0: u64, Arg1: &Coin): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin)\n\t1: Call coin::value(&Coin): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin)\n\t2: Call foo(u64, &Coin): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin)\n\t5: Call foo(u64, &Coin): u64\n\t6: Mul\n\t7: Ret\n\n}\n}" } } } }, { "outputState": { - "address": "0xc22d782d6b686022721c7a680612c20817b6cad04210f7df35e471dfd78881f8", + "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8", "asMovePackage": null } } @@ -63,7 +63,7 @@ Response: { "nodes": [ { "outputState": { - "address": "0x00abce450bda0ce7092d4c8930eaedf884ee0cb4584bf840e8f8950aa50de247", + "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20", "asMovePackage": { "all": { "edges": [ @@ -136,7 +136,7 @@ Response: { }, { "outputState": { - "address": "0xc22d782d6b686022721c7a680612c20817b6cad04210f7df35e471dfd78881f8", + "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8", "asMovePackage": null } } @@ -161,7 +161,7 @@ Response: { "nodes": [ { "outputState": { - "address": "0x00abce450bda0ce7092d4c8930eaedf884ee0cb4584bf840e8f8950aa50de247", + "address": "0x71c9cabc936c3a8f4d713575c2455982c03e5bf0acd1f6b2ee64befacf669e20", "asMovePackage": { "prefix": { "edges": [ @@ -276,7 +276,7 @@ Response: { }, { "outputState": { - "address": "0xc22d782d6b686022721c7a680612c20817b6cad04210f7df35e471dfd78881f8", + "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8", "asMovePackage": null } } diff --git a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp index 1d67e18900f..1144928ab75 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp @@ -154,19 +154,19 @@ Response: { "nodes": [ { "outputState": { - "address": "0x01df1e639fcb6895a9e429bc1451159e9555af99efa7a890d2aefaa9a64715bb", + "address": "0x1b2bdfde845714fd97810ccbf2f1395b476c4aee939e3f34d2f2e62e20804ed4", "asMovePackage": null } }, { "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "asMovePackage": null } }, { "outputState": { - "address": "0xfdc7773709c6f2c65d4cc9fbd7f8f2386ebc8262bb3e98f3bc3e530bfbedc0b0", + "address": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4", "asMovePackage": { "module": { "struct": { @@ -192,18 +192,6 @@ Response: { } } } - }, - { - "outputState": { - "address": "0x4615c74ea63279658fe68aeef2b01b8d257fcf64684b52e4803c723c2ac8d8f4", - "asMovePackage": null - } - }, - { - "outputState": { - "address": "0xdc5d27894ce68058f930efff3bd2ea07ac76e72c639da85bd8dd3821d8756ca5", - "asMovePackage": null - } } ] } @@ -236,25 +224,25 @@ Response: { "nodes": [ { "outputState": { - "address": "0x01df1e639fcb6895a9e429bc1451159e9555af99efa7a890d2aefaa9a64715bb", + "address": "0x1b2bdfde845714fd97810ccbf2f1395b476c4aee939e3f34d2f2e62e20804ed4", "asMovePackage": null } }, { "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "asMovePackage": null } }, { "outputState": { - "address": "0xdad85c173d1d2fb07344bcc64b496391646d774cf22e95c7285c7176ade2ce76", + "address": "0x68b559ac138602d697ab1e4122fbcf6a915990ab97383551b2d182118ac39274", "asMovePackage": { "module": { "s": { "module": { "package": { - "address": "0xfdc7773709c6f2c65d4cc9fbd7f8f2386ebc8262bb3e98f3bc3e530bfbedc0b0" + "address": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4" } }, "name": "S", @@ -279,7 +267,7 @@ Response: { "t": { "module": { "package": { - "address": "0xdad85c173d1d2fb07344bcc64b496391646d774cf22e95c7285c7176ade2ce76" + "address": "0x68b559ac138602d697ab1e4122fbcf6a915990ab97383551b2d182118ac39274" } }, "name": "T", @@ -306,12 +294,12 @@ Response: { { "name": "s", "type": { - "repr": "0xfdc7773709c6f2c65d4cc9fbd7f8f2386ebc8262bb3e98f3bc3e530bfbedc0b0::m::S", + "repr": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4::m::S", "signature": { "ref": null, "body": { "datatype": { - "package": "0xfdc7773709c6f2c65d4cc9fbd7f8f2386ebc8262bb3e98f3bc3e530bfbedc0b0", + "package": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4", "module": "m", "type": "S", "typeParameters": [] @@ -340,7 +328,7 @@ Response: { { "name": "t", "type": { - "repr": "0xfdc7773709c6f2c65d4cc9fbd7f8f2386ebc8262bb3e98f3bc3e530bfbedc0b0::m::T<0xfdc7773709c6f2c65d4cc9fbd7f8f2386ebc8262bb3e98f3bc3e530bfbedc0b0::m::S>" + "repr": "0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4::m::T<0x77ee5e2a86eab68c1f7a2bcd46ca4accf762a0b0579f348123896eda3c4799e4::m::S>" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/packages/types.exp b/crates/iota-graphql-e2e-tests/tests/packages/types.exp index f731c1ef6ed..a1f6e28517d 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/types.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/types.exp @@ -275,7 +275,7 @@ Response: { "data": null, "errors": [ { - "message": "Internal error occurred while processing request: Error calculating layout for 0x031f3c00b1e08a7663d48c96fa70684b022acc5fc423f9d1fbb60ac89af05e7e::m::S1: Type layout nesting exceeded limit of 128", + "message": "Internal error occurred while processing request: Error calculating layout for 0x317d8c42fd69e52da8a784d535b1cf53b9de0f7ec68ca200743d9a31e47f4771::m::S1: Type layout nesting exceeded limit of 128", "locations": [ { "line": 4, diff --git a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp index 1621a244b2a..f3a09bea180 100644 --- a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp +++ b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp @@ -31,14 +31,14 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 } ] } }, "firstPackage": { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1, "module": { "functions": { @@ -52,7 +52,7 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 } ] @@ -81,7 +81,7 @@ Response: { "version": 1 }, { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 } ] @@ -120,18 +120,18 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 } ] } }, "firstPackage": { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1, "module": { "functions": { @@ -145,11 +145,11 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 } ] @@ -178,11 +178,11 @@ Response: { "version": 1 }, { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 } ] @@ -224,22 +224,22 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 }, { - "address": "0x05384e77aa2501f0d36356d441b6071eaed2e43d1e02a357a9be6efb0c821c2d", + "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853", "version": 3 } ] } }, "firstPackage": { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1, "module": { "functions": { @@ -253,15 +253,15 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 }, { - "address": "0x05384e77aa2501f0d36356d441b6071eaed2e43d1e02a357a9be6efb0c821c2d", + "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853", "version": 3 } ] @@ -290,15 +290,15 @@ Response: { "version": 1 }, { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 }, { - "address": "0x05384e77aa2501f0d36356d441b6071eaed2e43d1e02a357a9be6efb0c821c2d", + "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853", "version": 3 } ] @@ -715,7 +715,7 @@ Response: { "after": { "nodes": [ { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2, "previousTransactionBlock": { "effects": { @@ -726,7 +726,7 @@ Response: { } }, { - "address": "0x05384e77aa2501f0d36356d441b6071eaed2e43d1e02a357a9be6efb0c821c2d", + "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853", "version": 3, "previousTransactionBlock": { "effects": { @@ -741,7 +741,7 @@ Response: { "between": { "nodes": [ { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2, "previousTransactionBlock": { "effects": { @@ -763,15 +763,15 @@ Response: { "packageVersions": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 }, { - "address": "0x05384e77aa2501f0d36356d441b6071eaed2e43d1e02a357a9be6efb0c821c2d", + "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853", "version": 3 } ] @@ -779,11 +779,11 @@ Response: { "after": { "nodes": [ { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 }, { - "address": "0x05384e77aa2501f0d36356d441b6071eaed2e43d1e02a357a9be6efb0c821c2d", + "address": "0x0b4ba6fb11093aee6043670f487eb02e0de56cf66fb1ccaf4c369bfba4346853", "version": 3 } ] @@ -791,11 +791,11 @@ Response: { "before": { "nodes": [ { - "address": "0xd4313c43c3a911f170e773b3b7932bbcb1757046c826728fb48a95e0736bbafb", + "address": "0x93ced85142b761e5d9e14ce7c9bd93b00010355462230fc1df9ef0cd05b2d773", "version": 1 }, { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 } ] @@ -803,7 +803,7 @@ Response: { "between": { "nodes": [ { - "address": "0xeaea5669c4477955a962870c0275f3b307883497f1691b181bcebde9dda76d08", + "address": "0xa1e60cf0ca1f2fc62f7eb917a89a71caae9980284aafa82ad418df82d6eb8f82", "version": 2 } ] diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp index 955f67bc61e..58869ad01d0 100644 --- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp +++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp @@ -54,7 +54,7 @@ Response: { }, { "node": { - "amount": "2000" + "amount": "1000" }, "cursor": "eyJpIjoxLCJjIjoyfQ" }, @@ -66,19 +66,19 @@ Response: { }, { "node": { - "amount": "1000" + "amount": "2000" }, "cursor": "eyJpIjozLCJjIjoyfQ" }, { "node": { - "amount": "3000" + "amount": "5000" }, "cursor": "eyJpIjo0LCJjIjoyfQ" }, { "node": { - "amount": "1000" + "amount": "3000" }, "cursor": "eyJpIjo1LCJjIjoyfQ" } @@ -111,13 +111,13 @@ Response: { "edges": [ { "node": { - "amount": "1000" + "amount": "2000" }, "cursor": "eyJpIjozLCJjIjoxfQ" }, { "node": { - "amount": "3000" + "amount": "5000" }, "cursor": "eyJpIjo0LCJjIjoxfQ" } @@ -156,7 +156,7 @@ Response: { }, { "node": { - "amount": "2000" + "amount": "1000" }, "cursor": "eyJpIjoxLCJjIjoxfQ" }, diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp index f923ee4406f..8498f8bf4d7 100644 --- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp +++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp @@ -65,7 +65,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "42fGuDs8aQxGjEqKymwG1KQWaRyd7xXxyepLyd8MKDLu", + "digest": "9pCyhXkr2tCkQh57rhbAEgELoLvUiiSN9M8gPqnn724p", "effects": { "dependencies": { "pageInfo": { @@ -78,26 +78,15 @@ Response: { { "cursor": "eyJpIjowLCJjIjoxfQ", "node": { - "digest": "4zoVEmZwsi62buCayUU8Skgc5jNx3nnQvUtQCncotRXj", + "digest": "C3fuzD6g6RtyaXcFfGepQcgNy5a2rxpLcepvvGbYKVVA", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { "nodes": [ + {}, { - "module": "M1", - "functionName": "sum" - }, - { - "module": "M1", - "functionName": "sum" - }, - { - "module": "M1", - "functionName": "sum" - }, - { - "module": "M1", - "functionName": "create" + "module": "package", + "functionName": "make_immutable" } ] } @@ -107,15 +96,26 @@ Response: { { "cursor": "eyJpIjoxLCJjIjoxfQ", "node": { - "digest": "Hv4oG9EB5nPxKgyLCyAonFFUa97mxLnUXVapMBu2nH43", + "digest": "FpvfXRTXL67N8gJukHxVLVBJ45ao2ZCgyNLbMZQgvWeh", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { "nodes": [ - {}, { - "module": "package", - "functionName": "make_immutable" + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "sum" + }, + { + "module": "M1", + "functionName": "create" } ] } @@ -138,7 +138,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "42fGuDs8aQxGjEqKymwG1KQWaRyd7xXxyepLyd8MKDLu", + "digest": "9pCyhXkr2tCkQh57rhbAEgELoLvUiiSN9M8gPqnn724p", "effects": { "dependencies": { "pageInfo": { @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJpIjoxLCJjIjoxfQ", "node": { - "digest": "Hv4oG9EB5nPxKgyLCyAonFFUa97mxLnUXVapMBu2nH43", + "digest": "FpvfXRTXL67N8gJukHxVLVBJ45ao2ZCgyNLbMZQgvWeh", "kind": { "__typename": "ProgrammableTransactionBlock", "transactions": { diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp index 9038014fdc2..88d6cb566fd 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp @@ -30,7 +30,7 @@ Response: { "c0": { "nodes": [ { - "digest": "GcUyosXyBY31652hSgsU5Gde7jzPyTQimDfM2GznB1S2", + "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm", "kind": { "__typename": "GenesisTransaction" } @@ -46,7 +46,7 @@ Response: { } }, { - "digest": "9BxxY2aKepD3ktJ3QEsP1vjAJkjtwQMw5p6csFUB17Pf", + "digest": "BVMk8VzSAJQwwW57SCSRdSBFxHPjbsLLzRw4ynJj2gLF", "kind": { "__typename": "ProgrammableTransactionBlock" } @@ -87,7 +87,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "GcUyosXyBY31652hSgsU5Gde7jzPyTQimDfM2GznB1S2", + "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm", "kind": { "__typename": "GenesisTransaction" } @@ -105,7 +105,7 @@ Response: { } }, { - "digest": "9BxxY2aKepD3ktJ3QEsP1vjAJkjtwQMw5p6csFUB17Pf", + "digest": "BVMk8VzSAJQwwW57SCSRdSBFxHPjbsLLzRw4ynJj2gLF", "kind": { "__typename": "ProgrammableTransactionBlock" } @@ -154,7 +154,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "GcUyosXyBY31652hSgsU5Gde7jzPyTQimDfM2GznB1S2", + "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm", "kind": { "__typename": "GenesisTransaction" } @@ -172,7 +172,7 @@ Response: { } }, { - "digest": "9BxxY2aKepD3ktJ3QEsP1vjAJkjtwQMw5p6csFUB17Pf", + "digest": "BVMk8VzSAJQwwW57SCSRdSBFxHPjbsLLzRw4ynJj2gLF", "kind": { "__typename": "ProgrammableTransactionBlock" } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp index 73b69dd5520..c9a9b9ab924 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp @@ -25,7 +25,7 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 1st command, from '0xec93b0e3c417e18e054f00f0cc4c66b8a78539a949ca5b306620b7f8aaf5913d::m::boom' (instruction 1), abort code: 42" + "errors": "Error in 1st command, from '0xba8d4a8da99b1a4d634efec621be8572f2ef2ef03409d2b673e58c7b9c7691de::m::boom' (instruction 1), abort code: 42" } } ] @@ -54,7 +54,7 @@ Response: { { "effects": { "status": "FAILURE", - "errors": "Error in 3rd command, from '0xec93b0e3c417e18e054f00f0cc4c66b8a78539a949ca5b306620b7f8aaf5913d::m::boom' (instruction 1), abort code: 42" + "errors": "Error in 3rd command, from '0xba8d4a8da99b1a4d634efec621be8572f2ef2ef03409d2b673e58c7b9c7691de::m::boom' (instruction 1), abort code: 42" } } ] diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp index f0919b2d060..272ac52ad2c 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp @@ -60,7 +60,7 @@ Response: { }, "nodes": [ { - "digest": "BrmwoxKGkndWUriBkmajng7GuWDDDJwgfu9wwGuN9zev", + "digest": "E3fHXmQFb8QHghYBJse4k4F2HLEZTACD2XMGw7UHec1p", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -68,7 +68,7 @@ Response: { } }, { - "digest": "5ksUtqcbsG5tM57GXnAWqPopAYzgnpGnCnRFSTw4Awb3", + "digest": "D5fnktTARqHzLNYKKpFN7K3U1VbEGNDjWo5vDy7NT14p", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -76,7 +76,7 @@ Response: { } }, { - "digest": "AN5sVYJHUTVTYnFYgwkyukLMXSUscg7YKax42d9135FX", + "digest": "7yrviMHuiaKBmDxqyb7Byzh4Tv735x4GDRA1i5NtcjpN", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -84,7 +84,7 @@ Response: { } }, { - "digest": "DFeFptJ3Tc3sAmBYdrsbDZnEJ8zDnvp4byqzaXzewaG4", + "digest": "D9nqoByPvocsTQonrtydYMZrUSH75qB7ro2k3oGP4Huo", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -92,7 +92,7 @@ Response: { } }, { - "digest": "6P1wyYsPmDahzvWjTqtFSTqASLqiVQx4YB2e3gN7Vq7V", + "digest": "DsgWBPabTgUShBimgoTSF1s41NGpMr4r5YTHps7Hdhv5", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -117,7 +117,7 @@ Response: { }, "nodes": [ { - "digest": "BrmwoxKGkndWUriBkmajng7GuWDDDJwgfu9wwGuN9zev", + "digest": "E3fHXmQFb8QHghYBJse4k4F2HLEZTACD2XMGw7UHec1p", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -142,7 +142,7 @@ Response: { }, "nodes": [ { - "digest": "5ksUtqcbsG5tM57GXnAWqPopAYzgnpGnCnRFSTw4Awb3", + "digest": "D5fnktTARqHzLNYKKpFN7K3U1VbEGNDjWo5vDy7NT14p", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -167,7 +167,7 @@ Response: { }, "nodes": [ { - "digest": "AN5sVYJHUTVTYnFYgwkyukLMXSUscg7YKax42d9135FX", + "digest": "7yrviMHuiaKBmDxqyb7Byzh4Tv735x4GDRA1i5NtcjpN", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -192,7 +192,7 @@ Response: { }, "nodes": [ { - "digest": "DFeFptJ3Tc3sAmBYdrsbDZnEJ8zDnvp4byqzaXzewaG4", + "digest": "D9nqoByPvocsTQonrtydYMZrUSH75qB7ro2k3oGP4Huo", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -217,7 +217,7 @@ Response: { }, "nodes": [ { - "digest": "6P1wyYsPmDahzvWjTqtFSTqASLqiVQx4YB2e3gN7Vq7V", + "digest": "DsgWBPabTgUShBimgoTSF1s41NGpMr4r5YTHps7Hdhv5", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp index 388358ae4f3..7673cae8f34 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp @@ -20,12 +20,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "7yu83zzohW1XpMxHAwrUrivcfdqmdh2KCKvZ37v5iPBg", + "digest": "EEvFNycnDYWz8o7ekDmsGLj3BHnXndRaMguMbRA1x1Qb", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "AKoXg/6D5YGXLPA9oIT9KLV3H/24fNJoZt9W7fPVKt4SUEYbX8S8DHZBmA5SkAXSbl2t9v7jBkKaUpy0pa8luwx/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "ANWEFJzs360MMlnYx5pPnDzQ1CM1NGfyatQVhLLCQ7QIAK781x1TUi3558YCbamgg/hVy6RYmEnDX40u0PsxJQB/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -34,7 +34,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" } ] }, @@ -96,7 +96,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "GcUyosXyBY31652hSgsU5Gde7jzPyTQimDfM2GznB1S2" + "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm" } ] }, @@ -116,37 +116,37 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x0846efff08221f9685365d064287d49054327432c48741661d46f494b2f84c8d", - "idCreated": true, + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x0846efff08221f9685365d064287d49054327432c48741661d46f494b2f84c8d", - "digest": "3kdnX61T9paJQeedhS8QYKCAdAx2ja5mWbDMtMzEzRdC" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", + "digest": "5KGPZwdxn3xtGaHjyTW2Pp2jRsfdPL75MWxWFgNUQ3S7" } }, { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "idCreated": false, + "address": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1", + "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "digest": "2b1szGUEp7X4W6G43J3gs6qUvyofEKG6Xqto7qJdtvQQ" + "address": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1", + "digest": "AWnh5JWaCiBBLzYrHDydq7muhGxyvCrx8qXAVwAiGuFW" } }, { - "address": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827", + "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827", - "digest": "CoaEaKR1McozywApryxJWWxEYuncs5cuiFtUsve8qu7d" + "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5", + "digest": "9L69ChGvUnBAkhxeYJrfrBKTvh6KYxzu4MSvLDxwHtJB" } } ] }, "gasEffects": { "gasObject": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" }, "gasSummary": { "computationCost": "1000000", @@ -163,7 +163,7 @@ Response: { "sequenceNumber": 1 }, "transactionBlock": { - "digest": "7yu83zzohW1XpMxHAwrUrivcfdqmdh2KCKvZ37v5iPBg" + "digest": "EEvFNycnDYWz8o7ekDmsGLj3BHnXndRaMguMbRA1x1Qb" } }, "expiration": null @@ -190,12 +190,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "9cxJZcyPgXjMPmoTBxM7PQ1Z1LEFSPXdBFV5UNYcBBsr", + "digest": "9XhEpQ8YEnaHJiYBmTdVaHH1kHBCuv5Nn9gH6MNQhZQW", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "ACvyxn5vTOoJ2R/Cn2W8tvENjipIcrUTfNCCTlM3BgPXQxtV7Bfo4E2fmEUHGhBcfvyP3AHVi9HOUPJGmJuW5QN/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "AKWRFhFX5MsJsB24J2geLc5QYCeBO8AwcMdKyb48mSPKaQKMbsEZ2Y9xTLmgVPHU4S7/SlEzrSviJUXPHTNBdwZ/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -204,7 +204,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" } ] }, @@ -219,21 +219,21 @@ Response: { "cursor": "eyJpIjowLCJjIjoyfQ", "node": { "__typename": "OwnedOrImmutable", - "address": "0x0846efff08221f9685365d064287d49054327432c48741661d46f494b2f84c8d", + "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5", "version": 2, - "digest": "3kdnX61T9paJQeedhS8QYKCAdAx2ja5mWbDMtMzEzRdC", + "digest": "9L69ChGvUnBAkhxeYJrfrBKTvh6KYxzu4MSvLDxwHtJB", "object": { - "address": "0x0846efff08221f9685365d064287d49054327432c48741661d46f494b2f84c8d", + "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5", "version": 2, - "digest": "3kdnX61T9paJQeedhS8QYKCAdAx2ja5mWbDMtMzEzRdC", + "digest": "9L69ChGvUnBAkhxeYJrfrBKTvh6KYxzu4MSvLDxwHtJB", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::package::UpgradeCap" }, "json": { - "id": "0x0846efff08221f9685365d064287d49054327432c48741661d46f494b2f84c8d", - "package": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827", + "id": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5", + "package": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1", "version": "1", "policy": 0 } @@ -315,7 +315,7 @@ Response: { "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002" ], - "currentPackage": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827", + "currentPackage": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1", "upgradeTicket": { "__typename": "Result", "cmd": 0, @@ -367,10 +367,10 @@ Response: { "dependencies": { "nodes": [ { - "digest": "7yu83zzohW1XpMxHAwrUrivcfdqmdh2KCKvZ37v5iPBg" + "digest": "CNw9XYFVwjaghvZWf98a5FmYs5MVtnqCSrFwpUtK6Gm" }, { - "digest": "GcUyosXyBY31652hSgsU5Gde7jzPyTQimDfM2GznB1S2" + "digest": "EEvFNycnDYWz8o7ekDmsGLj3BHnXndRaMguMbRA1x1Qb" } ] }, @@ -390,37 +390,37 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x0846efff08221f9685365d064287d49054327432c48741661d46f494b2f84c8d", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x0846efff08221f9685365d064287d49054327432c48741661d46f494b2f84c8d", - "digest": "5rqHkqTAvB4gGrpdwKB3X7yx42fQPmXkjQX6HquzE4YQ" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", + "digest": "GZ919iJ6Gwv6XsyWzTh9uHbwWTHz7XeJ2uMfYHe5D5HP" } }, { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "idCreated": false, + "address": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434", + "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "digest": "3hPsFkPRBXXQZa5B6yfaMC1cB5rKq79NPwWHJJDfzs5G" + "address": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434", + "digest": "5vGPcn2fi3JKnAcU4SY3CcaSRQn3ydaHKPJd37T8vE8Q" } }, { - "address": "0x636fec2071b067cd47d6388d380d029b6bbfe255e75ebdec9106a60f26d90560", - "idCreated": true, + "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5", + "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x636fec2071b067cd47d6388d380d029b6bbfe255e75ebdec9106a60f26d90560", - "digest": "Bn3mxU9z7FrdUHXYFsm9f26wftdPkN29JswS5SGKpT6Y" + "address": "0xeafbcd896fa977e961d0ab34f33a0f8ef4d8f249b244895d3f2c17d8d28352a5", + "digest": "F8bm8Wy2a1cVmrksJ8pTi2puh1xQeu7JWPeqjVQ3CkvK" } } ] }, "gasEffects": { "gasObject": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" }, "gasSummary": { "computationCost": "1000000", @@ -437,7 +437,7 @@ Response: { "sequenceNumber": 2 }, "transactionBlock": { - "digest": "9cxJZcyPgXjMPmoTBxM7PQ1Z1LEFSPXdBFV5UNYcBBsr" + "digest": "9XhEpQ8YEnaHJiYBmTdVaHH1kHBCuv5Nn9gH6MNQhZQW" } }, "expiration": null @@ -482,12 +482,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "JDtQReNP9NNFzaR91VpSitkB1cw11g41n4ieVCcLW2Ke", + "digest": "7ScQwMi7B9V5EgXAZMJpmTWztT4fZJN7BFWStEkW69Cr", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "ABcl1+dP9M/d04GQDpNCcmgfAojVDelh7UML/+nWlF9vVzM/9Zgu3tAX95EhDsMC/nlkwzg/Xd+kGKZtyVUZIw9/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "ACZTcpYTyN06yg++IS64MJ/VfRGE1mRSQRa43uCpXP+U6c0mgtyl/dvFVeeUOPMd5XroJVJhzNs/ZBxfPdS+6AZ/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -496,7 +496,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" } ] }, @@ -591,7 +591,7 @@ Response: { "cursor": "eyJpIjozLCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x636fec2071b067cd47d6388d380d029b6bbfe255e75ebdec9106a60f26d90560", + "package": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434", "module": "m", "functionName": "new", "typeArguments": [], @@ -615,7 +615,7 @@ Response: { ], "return": [ { - "repr": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827::m::Foo" + "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo" } ] } @@ -642,7 +642,7 @@ Response: { "cursor": "eyJpIjo1LCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x636fec2071b067cd47d6388d380d029b6bbfe255e75ebdec9106a60f26d90560", + "package": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434", "module": "m", "functionName": "new", "typeArguments": [], @@ -666,7 +666,7 @@ Response: { ], "return": [ { - "repr": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827::m::Foo" + "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo" } ] } @@ -676,7 +676,7 @@ Response: { "cursor": "eyJpIjo2LCJjIjozfQ", "node": { "__typename": "MoveCallTransaction", - "package": "0x636fec2071b067cd47d6388d380d029b6bbfe255e75ebdec9106a60f26d90560", + "package": "0xd92ae8b03f6ac4daf76d876938fcc2a593e7ff406dad1ee0e1a5b95f6cb65434", "module": "m", "functionName": "burn", "typeArguments": [], @@ -692,7 +692,7 @@ Response: { "typeParameters": [], "parameters": [ { - "repr": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827::m::Foo" + "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo" } ], "return": [] @@ -744,10 +744,10 @@ Response: { "dependencies": { "nodes": [ { - "digest": "9cxJZcyPgXjMPmoTBxM7PQ1Z1LEFSPXdBFV5UNYcBBsr" + "digest": "5yUiJzLrCmBipGvjVBovnEGgXF29jwam3JYhnYtkPEsy" }, { - "digest": "Cs9826UoCWKf1hNiL3AvZLUNEdvbjq7koKgSCW3JZFjD" + "digest": "9XhEpQ8YEnaHJiYBmTdVaHH1kHBCuv5Nn9gH6MNQhZQW" } ] }, @@ -767,19 +767,19 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "digest": "Axs9o9g6zRLWTk8y4h6yFgZViTPzF4RXaGNpnkce8gxU", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", + "digest": "HFmgTgnCkfsPBjztNYZfFrb1RMGGoq14RQH2zzd17Y8D", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", + "id": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "balance": { "value": "299999982082400" } @@ -789,45 +789,45 @@ Response: { } }, { - "address": "0x3ae6702801c6902eb3bdc76e3f254e336a50f37903c9537fb08ebdc66af45af4", + "address": "0xb076b3d51ddcb3c3bfa23c0d3ee2f1cca08e77c2546d2057c82275dbbc8dffff", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x3ae6702801c6902eb3bdc76e3f254e336a50f37903c9537fb08ebdc66af45af4", - "digest": "CuFbeNaTANhD4P9um1KeZq3N6yLAE9YfEqph3x7naeVy", + "address": "0xb076b3d51ddcb3c3bfa23c0d3ee2f1cca08e77c2546d2057c82275dbbc8dffff", + "digest": "BkvCYiVf16JB68DSUSD2Q9WnxAxZKzVv1akmhS2S7rMd", "asMoveObject": { "contents": { "type": { - "repr": "0x4727e7a070d440299c8918a5b0361df08474a087d088351f36158e2b5667d827::m::Foo" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0x3ae6702801c6902eb3bdc76e3f254e336a50f37903c9537fb08ebdc66af45af4", - "xs": [ - "42", - "43" - ] + "id": "0xb076b3d51ddcb3c3bfa23c0d3ee2f1cca08e77c2546d2057c82275dbbc8dffff", + "balance": { + "value": "2000" + } } } } } }, { - "address": "0x74b6c16a640092f327aa742a3f444c8a9c0e99e048736735e99e0639202f07da", + "address": "0xfc0517b5eab059e852955967e0fd4fd317548abc3c0aaed13a339ef1d883748f", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x74b6c16a640092f327aa742a3f444c8a9c0e99e048736735e99e0639202f07da", - "digest": "H7p7DsvGqkan27ADQsooKx3v8MZwgDTS5LDBnV1S34pw", + "address": "0xfc0517b5eab059e852955967e0fd4fd317548abc3c0aaed13a339ef1d883748f", + "digest": "4yQEGwrULKp2tW4My8idvVNE9ZjPwbqGXB78LZZzzmLK", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0xb13cb331988d6067f70d5a1c715be0203ff1cec6983c481196f0225e9da9bda1::m::Foo" }, "json": { - "id": "0x74b6c16a640092f327aa742a3f444c8a9c0e99e048736735e99e0639202f07da", - "balance": { - "value": "2000" - } + "id": "0xfc0517b5eab059e852955967e0fd4fd317548abc3c0aaed13a339ef1d883748f", + "xs": [ + "42", + "43" + ] } } } @@ -837,7 +837,7 @@ Response: { }, "gasEffects": { "gasObject": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" }, "gasSummary": { "computationCost": "1000000", @@ -854,7 +854,7 @@ Response: { "sequenceNumber": 3 }, "transactionBlock": { - "digest": "JDtQReNP9NNFzaR91VpSitkB1cw11g41n4ieVCcLW2Ke" + "digest": "7ScQwMi7B9V5EgXAZMJpmTWztT4fZJN7BFWStEkW69Cr" } }, "expiration": null @@ -881,12 +881,12 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "3sWb5ikHtuVYUoRg7WecPj4cj3UzuZJgz6wW8yA9Hp9o", + "digest": "7dyDFF4HApyHC4NUYRykLWRBGcZkEBJPFKTWR7NGnqbf", "sender": { "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a" }, "signatures": [ - "ACOUIjr22KZzZZ+i1I00zWbnlDdRakWNKcqjb47IQW6AvdSGdbxz4Lx/U+3oyhrAma/jwV/yiWdmSeDooErZtAF/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" + "APsRYujXA9MTo750KANcVG2sEvE+mMWhO0AMmgUmPXykaI8LSKjfTyg1dkdpGbRIMviGdNH6EjFt4JK87KDIywR/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA==" ], "gasInput": { "gasSponsor": { @@ -895,7 +895,7 @@ Response: { "gasPayment": { "nodes": [ { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" } ] }, @@ -942,7 +942,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "JDtQReNP9NNFzaR91VpSitkB1cw11g41n4ieVCcLW2Ke" + "digest": "7ScQwMi7B9V5EgXAZMJpmTWztT4fZJN7BFWStEkW69Cr" } ] }, @@ -962,19 +962,19 @@ Response: { "objectChanges": { "nodes": [ { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", "idCreated": false, "idDeleted": false, "outputState": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c", - "digest": "8uEkTALwnaXWBEX7WYE5WcA7iZDwDnU1txGPvu2qHM8t" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af", + "digest": "8cZJp6TcRA3d36RZYYAAayxEkrvkafwzC5FQsX6gxZUr" } } ] }, "gasEffects": { "gasObject": { - "address": "0x16a8e888439fb865e2ebb65d890e872be6717414f401f079b5741e67467ca41c" + "address": "0x5c1292f982e4f4162d6bda7f92177d35c6d0cfbb5b5317a91269d060fb7aa7af" }, "gasSummary": { "computationCost": "1000000", @@ -991,7 +991,7 @@ Response: { "sequenceNumber": 4 }, "transactionBlock": { - "digest": "3sWb5ikHtuVYUoRg7WecPj4cj3UzuZJgz6wW8yA9Hp9o" + "digest": "7dyDFF4HApyHC4NUYRykLWRBGcZkEBJPFKTWR7NGnqbf" } }, "expiration": null diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp index ebeb8b8e7d7..ea36ea21514 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp @@ -19,7 +19,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000008", "inner": { - "id": "0x0a4818932295cdda8e2bf2bdf2af0d8022da23aafcc2a3a671f0db8a18a40914", + "id": "0x3ea5f6c162a25be99c5853e0d393a986af600b290c1c48ce6896602d36115385", "version": "1" } } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp index 2f8cca14658..b6339352d48 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -124,7 +124,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "5wW9eGhGKPoDfUxsiWHTgcxDBz34QD7Fc6cMiMEqwMW", + "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -135,7 +135,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DvLhb1b8EgZnnqHeJewPu5wcySe1Emthar62n68G2JeA", + "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -163,7 +163,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "5wW9eGhGKPoDfUxsiWHTgcxDBz34QD7Fc6cMiMEqwMW", + "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -191,7 +191,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "4JVs5UtEghNfT8MhBCxi5Dqc64sb2qM3gKynVrrDSnvM", + "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -219,7 +219,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DvLhb1b8EgZnnqHeJewPu5wcySe1Emthar62n68G2JeA", + "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -230,7 +230,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "4JVs5UtEghNfT8MhBCxi5Dqc64sb2qM3gKynVrrDSnvM", + "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -258,7 +258,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "FjEwv7uuizMyfXs2xHPRkTUHKhyAL7W9yGHGTBV7uwMW", + "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -286,7 +286,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "FjEwv7uuizMyfXs2xHPRkTUHKhyAL7W9yGHGTBV7uwMW", + "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp index 34bdb4c1234..5db8f2df403 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EjHhzapgKBFRNw7b6w1Ug7FPYjDZZgPvtwb3BVzu9HVw", + "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -124,7 +124,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EjHhzapgKBFRNw7b6w1Ug7FPYjDZZgPvtwb3BVzu9HVw", + "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -135,7 +135,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "3YkKM9NR6VoFxtnDP4QgVvCUmda7paoXjse17LjsVqH5", + "digest": "7ym2EAwHQ6uwKP6Kf8gvmo8oJGoGvaiNKNH9iQdAHUmq", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -163,7 +163,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "AjYmhGr6j3jYSES2NVkd57p973gwa3UZbh2tv9QK6S2m", + "digest": "4sC14KitR3PTk2aGHS8zdGRTZcruQSweWXY1P7mfYTLW", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp index ee5efca31d1..a7fc41d8452 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EjHhzapgKBFRNw7b6w1Ug7FPYjDZZgPvtwb3BVzu9HVw", + "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "3YkKM9NR6VoFxtnDP4QgVvCUmda7paoXjse17LjsVqH5", + "digest": "7ym2EAwHQ6uwKP6Kf8gvmo8oJGoGvaiNKNH9iQdAHUmq", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "Ejp4Gnf3Gw8A3GpDDSEK1dTFXckwp6gs2bMnysHPMrzm", + "digest": "2A5RGEPYgUn7GbamdVBXWLzokKQStup1DNzqkxQqqmgW", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "4MTQKdLBaFpFGTLpFqWHjeWmzuvCmbiDuqp6uRi8wBfx", + "digest": "7WTn3jXerZU2jTq9JWjgS75U2w4ayK5eNzUxegW4qpTq", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -168,7 +168,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -196,7 +196,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "EjHhzapgKBFRNw7b6w1Ug7FPYjDZZgPvtwb3BVzu9HVw", + "digest": "CG7koKCHyRYi8AFPnKoKVBQkM8MJzSmCnWwM2XGRCbab", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -224,7 +224,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "3YkKM9NR6VoFxtnDP4QgVvCUmda7paoXjse17LjsVqH5", + "digest": "7ym2EAwHQ6uwKP6Kf8gvmo8oJGoGvaiNKNH9iQdAHUmq", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -268,7 +268,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "Ejp4Gnf3Gw8A3GpDDSEK1dTFXckwp6gs2bMnysHPMrzm", + "digest": "2A5RGEPYgUn7GbamdVBXWLzokKQStup1DNzqkxQqqmgW", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "4MTQKdLBaFpFGTLpFqWHjeWmzuvCmbiDuqp6uRi8wBfx", + "digest": "7WTn3jXerZU2jTq9JWjgS75U2w4ayK5eNzUxegW4qpTq", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -333,7 +333,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "Ejp4Gnf3Gw8A3GpDDSEK1dTFXckwp6gs2bMnysHPMrzm", + "digest": "2A5RGEPYgUn7GbamdVBXWLzokKQStup1DNzqkxQqqmgW", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -344,7 +344,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "4MTQKdLBaFpFGTLpFqWHjeWmzuvCmbiDuqp6uRi8wBfx", + "digest": "7WTn3jXerZU2jTq9JWjgS75U2w4ayK5eNzUxegW4qpTq", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp index 1d598558f67..3bad80a971e 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "FirY733kBLzzbcnFsSPoeWLWAYBA1DcjHcurF9X1yxWa", + "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "7xVbGwKZMhSTY8fc9AhmcxsSagqiN55EgWstg8tzJRDg", + "digest": "5ijxkCKmY5GhbDpZ8EUT5cEHCPrhSxmySCsy9P7hdnav", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "FCX74CUei7vEA5kENiNyRGsWg2KuPNfyy1U81yRgnt1P", + "digest": "GL1RzmY36Heq6Ep8b3TB8gggSPJfDXHXHLG1cEMpeiaQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "MWWXrHgPzcyTSU7qoV7QAwTcrwLt2djL5qHWED2354v", + "digest": "8gsWcWUrsfT2XoA1sztv3dLLM6h47ZqiMf2VPutUrt33", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -168,7 +168,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "MWWXrHgPzcyTSU7qoV7QAwTcrwLt2djL5qHWED2354v", + "digest": "8gsWcWUrsfT2XoA1sztv3dLLM6h47ZqiMf2VPutUrt33", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -196,7 +196,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "FCX74CUei7vEA5kENiNyRGsWg2KuPNfyy1U81yRgnt1P", + "digest": "GL1RzmY36Heq6Ep8b3TB8gggSPJfDXHXHLG1cEMpeiaQ", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -224,7 +224,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "7xVbGwKZMhSTY8fc9AhmcxsSagqiN55EgWstg8tzJRDg", + "digest": "5ijxkCKmY5GhbDpZ8EUT5cEHCPrhSxmySCsy9P7hdnav", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -268,7 +268,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "FirY733kBLzzbcnFsSPoeWLWAYBA1DcjHcurF9X1yxWa", + "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp index 0fa196e86e5..4cccc349430 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp @@ -164,7 +164,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -175,7 +175,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "3B8UsX3diudqqgPmkuwremUc5cR49mJkxdPzfLUJ1BGq", + "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -186,7 +186,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "FvrRt4VHFqh8RtDtR3FPwiDAbt1VuV1aS9bJyp3DSnu8", + "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -197,7 +197,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxOCwiaSI6ZmFsc2V9", "node": { - "digest": "3bQyYzXuE22XcazmaR9fb48yyAXHwazXqzszfSvj1CnH", + "digest": "D9bZNc9AmSiAMDE5kJTxgQqhQcstsokmBA4Mq4QqQGUx", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -208,7 +208,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "99chatBJVEwgJFy2cLCpEafTSgcs3kYjsjm8WymdLmdY", + "digest": "BBZrmvswLx4LbYNzKZAH5bGFp8PihXWvNLnaBZNLN6kZ", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -236,7 +236,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -264,7 +264,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "3B8UsX3diudqqgPmkuwremUc5cR49mJkxdPzfLUJ1BGq", + "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -308,7 +308,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "FvrRt4VHFqh8RtDtR3FPwiDAbt1VuV1aS9bJyp3DSnu8", + "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -336,7 +336,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxOCwiaSI6ZmFsc2V9", "node": { - "digest": "3bQyYzXuE22XcazmaR9fb48yyAXHwazXqzszfSvj1CnH", + "digest": "D9bZNc9AmSiAMDE5kJTxgQqhQcstsokmBA4Mq4QqQGUx", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -364,7 +364,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "99chatBJVEwgJFy2cLCpEafTSgcs3kYjsjm8WymdLmdY", + "digest": "BBZrmvswLx4LbYNzKZAH5bGFp8PihXWvNLnaBZNLN6kZ", "effects": { "checkpoint": { "sequenceNumber": 5 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp index 69ef41256cf..ef9a1dd3b8c 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp @@ -164,7 +164,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -175,7 +175,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "3B8UsX3diudqqgPmkuwremUc5cR49mJkxdPzfLUJ1BGq", + "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -186,7 +186,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "FvrRt4VHFqh8RtDtR3FPwiDAbt1VuV1aS9bJyp3DSnu8", + "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -197,7 +197,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "Hjqv7QdSM2G2yfurdHv36unknXNu1JnoHjJcW2UsYwVq", + "digest": "78XKtEqaRGRjsrF8PEBRpcJ22AmzaZtat3NmeCwc2kpD", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -225,7 +225,7 @@ Response: { { "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9", "node": { - "digest": "Hjqv7QdSM2G2yfurdHv36unknXNu1JnoHjJcW2UsYwVq", + "digest": "78XKtEqaRGRjsrF8PEBRpcJ22AmzaZtat3NmeCwc2kpD", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -253,7 +253,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9", "node": { - "digest": "FvrRt4VHFqh8RtDtR3FPwiDAbt1VuV1aS9bJyp3DSnu8", + "digest": "nxC5491CFRQaXhrs1YfTj9hqGg4apLs8aLrWDY1xxu3", "effects": { "checkpoint": { "sequenceNumber": 5 @@ -313,7 +313,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "3B8UsX3diudqqgPmkuwremUc5cR49mJkxdPzfLUJ1BGq", + "digest": "6y9UF1snskP2LXvGksRVjXJqTaNS7ADtizyQaVXSVn16", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -341,7 +341,7 @@ Response: { { "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp index 94613b6858d..f147fc6aa7e 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "8yc9oAm3R4131ZyaFPmyUpzQR5gz42Bin7ADTqjvRnCx", + "digest": "2Ti9BKLVNTkifpJUXhXtYRe4o4HM1Hnsv977TXgxtnbP", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "5wW9eGhGKPoDfUxsiWHTgcxDBz34QD7Fc6cMiMEqwMW", + "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "D6AUvEYJVe6aZsxRn1CqcPLFbcuLKskfrSY1jMYNR2Ha", + "digest": "BHxSqDRAs12PCjUVE8Xxrmq8ddhL8RLW1EnqJipprim", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DvLhb1b8EgZnnqHeJewPu5wcySe1Emthar62n68G2JeA", + "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "96n3Rq5QnAGcXPHsom5kMHiWorsd28yAcjTpjKU2mDht", + "digest": "Dqpsd6xzFPoLC6iKK2kyYZmfuAnaDkUKa4QaWBTA9DUk", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -162,7 +162,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "4JVs5UtEghNfT8MhBCxi5Dqc64sb2qM3gKynVrrDSnvM", + "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -173,7 +173,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "85YmFDGF6qzNkXjeXwqfguzjopXQk4Yo6S7rizt5BXSH", + "digest": "6VJkYFBeAe8PydrD4BFcdKEGCMjzePgPViRzBzPydyMT", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -184,7 +184,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "FjEwv7uuizMyfXs2xHPRkTUHKhyAL7W9yGHGTBV7uwMW", + "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -195,7 +195,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "4DpnvwQZvwxPUBVmBDntFc5ie5L2kA6W2GWU6NtG5dzm", + "digest": "G4ETt5JzNXD4KgULBkhVEPN3p2qcneov6idAVXtFEk7g", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -223,7 +223,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -251,7 +251,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "5wW9eGhGKPoDfUxsiWHTgcxDBz34QD7Fc6cMiMEqwMW", + "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DvLhb1b8EgZnnqHeJewPu5wcySe1Emthar62n68G2JeA", + "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -290,7 +290,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "4JVs5UtEghNfT8MhBCxi5Dqc64sb2qM3gKynVrrDSnvM", + "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -318,7 +318,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "FjEwv7uuizMyfXs2xHPRkTUHKhyAL7W9yGHGTBV7uwMW", + "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T", "effects": { "checkpoint": { "sequenceNumber": 3 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp index 1017c645ef0..4b01bc01e9b 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp @@ -96,7 +96,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -107,7 +107,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0", "node": { - "digest": "8yc9oAm3R4131ZyaFPmyUpzQR5gz42Bin7ADTqjvRnCx", + "digest": "2Ti9BKLVNTkifpJUXhXtYRe4o4HM1Hnsv977TXgxtnbP", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "5wW9eGhGKPoDfUxsiWHTgcxDBz34QD7Fc6cMiMEqwMW", + "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -129,7 +129,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0", "node": { - "digest": "D6AUvEYJVe6aZsxRn1CqcPLFbcuLKskfrSY1jMYNR2Ha", + "digest": "BHxSqDRAs12PCjUVE8Xxrmq8ddhL8RLW1EnqJipprim", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -140,7 +140,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DvLhb1b8EgZnnqHeJewPu5wcySe1Emthar62n68G2JeA", + "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -151,7 +151,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0", "node": { - "digest": "96n3Rq5QnAGcXPHsom5kMHiWorsd28yAcjTpjKU2mDht", + "digest": "Dqpsd6xzFPoLC6iKK2kyYZmfuAnaDkUKa4QaWBTA9DUk", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -162,7 +162,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "4JVs5UtEghNfT8MhBCxi5Dqc64sb2qM3gKynVrrDSnvM", + "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -173,7 +173,7 @@ Response: { { "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0", "node": { - "digest": "85YmFDGF6qzNkXjeXwqfguzjopXQk4Yo6S7rizt5BXSH", + "digest": "6VJkYFBeAe8PydrD4BFcdKEGCMjzePgPViRzBzPydyMT", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -184,7 +184,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "FjEwv7uuizMyfXs2xHPRkTUHKhyAL7W9yGHGTBV7uwMW", + "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -195,7 +195,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9", "node": { - "digest": "4DpnvwQZvwxPUBVmBDntFc5ie5L2kA6W2GWU6NtG5dzm", + "digest": "G4ETt5JzNXD4KgULBkhVEPN3p2qcneov6idAVXtFEk7g", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -223,7 +223,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9", "node": { - "digest": "FjEwv7uuizMyfXs2xHPRkTUHKhyAL7W9yGHGTBV7uwMW", + "digest": "G4DQGY8uNqmuvgNUfgZsUgygYsm7uYTmJqeVS3KQce7T", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -251,7 +251,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0", "node": { - "digest": "4JVs5UtEghNfT8MhBCxi5Dqc64sb2qM3gKynVrrDSnvM", + "digest": "AGJCoFvR9E9Hu8DgiVb4YjGh8BQoztVAT4njj6epasgy", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -279,7 +279,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0", "node": { - "digest": "DvLhb1b8EgZnnqHeJewPu5wcySe1Emthar62n68G2JeA", + "digest": "GF6RDKf6T3QzjyEvgXjwDUGivbugjgtoaaJgnRJjrMmj", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -307,7 +307,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0", "node": { - "digest": "5wW9eGhGKPoDfUxsiWHTgcxDBz34QD7Fc6cMiMEqwMW", + "digest": "7qVK75EL3CwAFnYkskDSc4bH3p9fihdzk2N5qH5TH3WH", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -335,7 +335,7 @@ Response: { { "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "EqqWSPU9Xpov2yDutF8bhtMpkbqB66Ct3AN8sMJWBUCu", + "digest": "3wzRVqK1eXohkhxfHurLNoxT7GtMtvqzDeBDxxmswVJU", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp index a6d7e6fae03..0c424b3061c 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp @@ -94,7 +94,7 @@ Response: { }, "nodes": [ { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -102,7 +102,7 @@ Response: { } }, { - "digest": "FirY733kBLzzbcnFsSPoeWLWAYBA1DcjHcurF9X1yxWa", + "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -110,7 +110,7 @@ Response: { } }, { - "digest": "9K2FJpFUUXiEV8LznzjUQJcY2K4vmX9kECwKas2vsyG", + "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -118,7 +118,7 @@ Response: { } }, { - "digest": "BwBbnCKP9UAtpPSVV3RZqzozM15AaHDFtoRnpqkWDBMk", + "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -126,7 +126,7 @@ Response: { } }, { - "digest": "9EdPgfA4esk9eiAHDGuhDSwznBpu4Z35cpEaaADvP5zT", + "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -134,7 +134,7 @@ Response: { } }, { - "digest": "CxwvRZkjcFEqnFeqT4zQyQwKRpaS1NMnfk6ZHgrcuWEQ", + "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -142,7 +142,7 @@ Response: { } }, { - "digest": "DSidHVd7b7Thys1ehtjw9sDtGq34KiMKC3sTmg2ys5sX", + "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -150,7 +150,7 @@ Response: { } }, { - "digest": "4LPxvoFmcA94gU2RuAmzhLP5QQZ8dyrMo8LVb8gmpVo1", + "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -158,7 +158,7 @@ Response: { } }, { - "digest": "7jpEY9PpZzHzDq7r9iBijzJuaLbCAKnSL6eujudmsSr4", + "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -166,7 +166,7 @@ Response: { } }, { - "digest": "Cvni8txxPnGMqbECvskbzo3T2JKoenM8bUYSYRZnqrDt", + "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -191,7 +191,7 @@ Response: { }, "nodes": [ { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -199,7 +199,7 @@ Response: { } }, { - "digest": "FirY733kBLzzbcnFsSPoeWLWAYBA1DcjHcurF9X1yxWa", + "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -207,7 +207,7 @@ Response: { } }, { - "digest": "9K2FJpFUUXiEV8LznzjUQJcY2K4vmX9kECwKas2vsyG", + "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -215,7 +215,7 @@ Response: { } }, { - "digest": "BwBbnCKP9UAtpPSVV3RZqzozM15AaHDFtoRnpqkWDBMk", + "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -223,7 +223,7 @@ Response: { } }, { - "digest": "9EdPgfA4esk9eiAHDGuhDSwznBpu4Z35cpEaaADvP5zT", + "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -231,7 +231,7 @@ Response: { } }, { - "digest": "CxwvRZkjcFEqnFeqT4zQyQwKRpaS1NMnfk6ZHgrcuWEQ", + "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -239,7 +239,7 @@ Response: { } }, { - "digest": "DSidHVd7b7Thys1ehtjw9sDtGq34KiMKC3sTmg2ys5sX", + "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -247,7 +247,7 @@ Response: { } }, { - "digest": "4LPxvoFmcA94gU2RuAmzhLP5QQZ8dyrMo8LVb8gmpVo1", + "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -255,7 +255,7 @@ Response: { } }, { - "digest": "7jpEY9PpZzHzDq7r9iBijzJuaLbCAKnSL6eujudmsSr4", + "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -263,7 +263,7 @@ Response: { } }, { - "digest": "Cvni8txxPnGMqbECvskbzo3T2JKoenM8bUYSYRZnqrDt", + "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -311,7 +311,7 @@ Response: { }, "nodes": [ { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -319,7 +319,7 @@ Response: { } }, { - "digest": "FirY733kBLzzbcnFsSPoeWLWAYBA1DcjHcurF9X1yxWa", + "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -327,7 +327,7 @@ Response: { } }, { - "digest": "9K2FJpFUUXiEV8LznzjUQJcY2K4vmX9kECwKas2vsyG", + "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -335,7 +335,7 @@ Response: { } }, { - "digest": "BwBbnCKP9UAtpPSVV3RZqzozM15AaHDFtoRnpqkWDBMk", + "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -343,7 +343,7 @@ Response: { } }, { - "digest": "9EdPgfA4esk9eiAHDGuhDSwznBpu4Z35cpEaaADvP5zT", + "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -351,7 +351,7 @@ Response: { } }, { - "digest": "CxwvRZkjcFEqnFeqT4zQyQwKRpaS1NMnfk6ZHgrcuWEQ", + "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -359,7 +359,7 @@ Response: { } }, { - "digest": "DSidHVd7b7Thys1ehtjw9sDtGq34KiMKC3sTmg2ys5sX", + "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -367,7 +367,7 @@ Response: { } }, { - "digest": "4LPxvoFmcA94gU2RuAmzhLP5QQZ8dyrMo8LVb8gmpVo1", + "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -375,7 +375,7 @@ Response: { } }, { - "digest": "7jpEY9PpZzHzDq7r9iBijzJuaLbCAKnSL6eujudmsSr4", + "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -383,7 +383,7 @@ Response: { } }, { - "digest": "Cvni8txxPnGMqbECvskbzo3T2JKoenM8bUYSYRZnqrDt", + "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -431,7 +431,7 @@ Response: { }, "nodes": [ { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -439,7 +439,7 @@ Response: { } }, { - "digest": "FirY733kBLzzbcnFsSPoeWLWAYBA1DcjHcurF9X1yxWa", + "digest": "14Dp55F4CcoMwSXo9UJJj9rLWHHrsh55u1bG8AyJzf29", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -447,7 +447,7 @@ Response: { } }, { - "digest": "9K2FJpFUUXiEV8LznzjUQJcY2K4vmX9kECwKas2vsyG", + "digest": "FSFfAaccXApG4NNDNwsvfeWqzZx7WHBtssn7yCpKF7w1", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -455,7 +455,7 @@ Response: { } }, { - "digest": "BwBbnCKP9UAtpPSVV3RZqzozM15AaHDFtoRnpqkWDBMk", + "digest": "432fq3xpYtMXxVMuNcBzPK4ikrpFTEVGEiKLNsjpmczY", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -463,7 +463,7 @@ Response: { } }, { - "digest": "9EdPgfA4esk9eiAHDGuhDSwznBpu4Z35cpEaaADvP5zT", + "digest": "oBvYm41RTyB7u5HGE91QdKNNRw5AYXBrFEDLJTXnN9F", "effects": { "checkpoint": { "sequenceNumber": 2 @@ -471,7 +471,7 @@ Response: { } }, { - "digest": "CxwvRZkjcFEqnFeqT4zQyQwKRpaS1NMnfk6ZHgrcuWEQ", + "digest": "GQEae2TqUmShfWdHzyTieg8MPGeFzbdfHyAA94mKzkd6", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -479,7 +479,7 @@ Response: { } }, { - "digest": "DSidHVd7b7Thys1ehtjw9sDtGq34KiMKC3sTmg2ys5sX", + "digest": "CTghAa6p4x2gFzMkJV8b4TVeBbHtkGoXaeZ1Vzh3y5ut", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -487,7 +487,7 @@ Response: { } }, { - "digest": "4LPxvoFmcA94gU2RuAmzhLP5QQZ8dyrMo8LVb8gmpVo1", + "digest": "87KM1JvWfHMoYiFeasoiLWPVL2PxBjTgYtuTf8Lk21CT", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -495,7 +495,7 @@ Response: { } }, { - "digest": "7jpEY9PpZzHzDq7r9iBijzJuaLbCAKnSL6eujudmsSr4", + "digest": "FvRkrmggzayGPtrvGT6AGS8Jm7os61CCcG6N2BthoLQ3", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -503,7 +503,7 @@ Response: { } }, { - "digest": "Cvni8txxPnGMqbECvskbzo3T2JKoenM8bUYSYRZnqrDt", + "digest": "86ABFdM2RxENvN1biiiUNv7T4nCayFkjELaz4MKwNguF", "effects": { "checkpoint": { "sequenceNumber": 3 @@ -592,7 +592,7 @@ Response: { { "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0", "node": { - "digest": "Fpc7N9qYBCegSxBgmmEwANpQecoRmNriyNnA1WCgZ7T9", + "digest": "HN64Vz8PmNEztyXSjqgeC7BazCvvdHT9BN62t9WJJiiD", "effects": { "checkpoint": { "sequenceNumber": 2 diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp index e8499db5828..d14d150ad15 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp @@ -42,7 +42,7 @@ Response: { "transactions": { "nodes": [ { - "package": "0xc75e2a7ac0f53611d8d308f4c61cfd5eb0ebfe119fca77aa76725de93d04a2eb", + "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1", "module": "m", "functionName": "get" } @@ -55,17 +55,17 @@ Response: { "nodes": [ { "__typename": "SharedObjectRead", - "address": "0xe2feed8adeb99f6cfbd36426e9cad756f2c083d56d51b9a8243c93389f514a04", + "address": "0x66fe37423f804cff0e56178a0cab944ca04c468d6a1f32cc003f380d3b97e5fe", "version": 2, - "digest": "Q6yqwPApQMm8cUXQpsnUmUCNR7taYTa5kNLHMeTH8f4", + "digest": "3xuze1PbHS7BukpEDvhHuB5vs9m1DmRve76xUaeN9M1t", "object": { "asMoveObject": { "contents": { "type": { - "repr": "0xc75e2a7ac0f53611d8d308f4c61cfd5eb0ebfe119fca77aa76725de93d04a2eb::m::Foo" + "repr": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1::m::Foo" }, "json": { - "id": "0xe2feed8adeb99f6cfbd36426e9cad756f2c083d56d51b9a8243c93389f514a04", + "id": "0x66fe37423f804cff0e56178a0cab944ca04c468d6a1f32cc003f380d3b97e5fe", "x": "0" } } @@ -82,7 +82,7 @@ Response: { "transactions": { "nodes": [ { - "package": "0xc75e2a7ac0f53611d8d308f4c61cfd5eb0ebfe119fca77aa76725de93d04a2eb", + "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1", "module": "m", "functionName": "inc" } @@ -102,12 +102,12 @@ Response: { "transactions": { "nodes": [ { - "package": "0xc75e2a7ac0f53611d8d308f4c61cfd5eb0ebfe119fca77aa76725de93d04a2eb", + "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1", "module": "m", "functionName": "get" }, { - "package": "0xc75e2a7ac0f53611d8d308f4c61cfd5eb0ebfe119fca77aa76725de93d04a2eb", + "package": "0x89e86c4735c8265305f0fa793bcec8bc0c62374c33035bcad3ba6eb8dffeedf1", "module": "m", "functionName": "inc" } diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp index ad980c55ac7..02fd27d573e 100644 --- a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp +++ b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp @@ -7,7 +7,7 @@ Response: { "transactionBlocks": { "nodes": [ { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD", + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q", "sender": null, "signatures": [ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" @@ -407,7 +407,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000008", "inner": { - "id": "0x0a4818932295cdda8e2bf2bdf2af0d8022da23aafcc2a3a671f0db8a18a40914", + "id": "0x3ea5f6c162a25be99c5853e0d393a986af600b290c1c48ce6896602d36115385", "version": "1" } } @@ -489,7 +489,7 @@ Response: { "json": { "id": "0x0000000000000000000000000000000000000000000000000000000000000403", "lists": { - "id": "0x60dbd7095109dfd525da2db8f525d33227ba04ae8d25d8709a507018f52d31c0", + "id": "0x68c6e7ce3c1cc8d9740b644a374a43ab37106afa81f5f863abbea3128d3be410", "size": "0" } } @@ -586,17 +586,51 @@ Response: { { "cursor": "eyJpIjo5LCJjIjowfQ", "node": { - "address": "0x17c0381ca02ae48b3a0819b083e43663e17be2e3936fbf06aad42e97c3065a08", + "address": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" }, "json": { - "id": "0x17c0381ca02ae48b3a0819b083e43663e17be2e3936fbf06aad42e97c3065a08", - "balance": { - "value": "30000000000000000" - } + "id": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3", + "fields": { + "contents": [ + { + "key": "name", + "value": "{immutable_metadata.name}" + }, + { + "key": "image_url", + "value": "{immutable_metadata.uri}" + }, + { + "key": "description", + "value": "{immutable_metadata.description}" + }, + { + "key": "creator", + "value": "{immutable_metadata.issuer_name}" + }, + { + "key": "version", + "value": "{immutable_metadata.version}" + }, + { + "key": "media_type", + "value": "{immutable_metadata.media_type}" + }, + { + "key": "collection_name", + "value": "{immutable_metadata.collection_name}" + }, + { + "key": "immutable_issuer", + "value": "{immutable_issuer}" + } + ] + }, + "version": 1 } } }, @@ -605,30 +639,6 @@ Response: { }, { "cursor": "eyJpIjoxMCwiYyI6MH0", - "node": { - "address": "0x3017347a061e7145034c803925f9a84e7e2fc1a24f09d1701996d9fb66a970f2", - "asMoveObject": { - "contents": { - "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" - }, - "json": { - "id": "0x3017347a061e7145034c803925f9a84e7e2fc1a24f09d1701996d9fb66a970f2", - "name": "1", - "value": { - "version": "1", - "epoch": "0", - "randomness_round": "0", - "random_bytes": [] - } - } - } - }, - "asMovePackage": null - } - }, - { - "cursor": "eyJpIjoxMSwiYyI6MH0", "node": { "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", "asMoveObject": { @@ -666,23 +676,17 @@ Response: { } }, { - "cursor": "eyJpIjoxMiwiYyI6MH0", + "cursor": "eyJpIjoxMSwiYyI6MH0", "node": { - "address": "0x67c78a960ae2478d20a0358519fc411998b577c8c30d25ab83eb5cba5389d377", + "address": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap" }, "json": { - "id": "0x67c78a960ae2478d20a0358519fc411998b577c8c30d25ab83eb5cba5389d377", - "name": "1", - "value": { - "version": "1", - "epoch": "0", - "randomness_round": "0", - "random_bytes": [] - } + "id": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a", + "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" } } }, @@ -690,7 +694,7 @@ Response: { } }, { - "cursor": "eyJpIjoxNSwiYyI6MH0", + "cursor": "eyJpIjoxMiwiYyI6MH0", "node": { "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", "asMoveObject": { @@ -707,7 +711,7 @@ Response: { "system_state_version": "1", "iota_treasury_cap": { "inner": { - "id": "0xde341860ab0f8249d38c7924fa287bdd20ac5dacb26a276b53a875a2be9972a4", + "id": "0xccac92582a6d7c09456cc24b9c75416411abd4b02a1bfceda7f521aa439e3a8d", "total_supply": { "value": "31800000000000000" } @@ -954,15 +958,15 @@ Response: { "next_epoch_p2p_address": null, "next_epoch_primary_address": null, "extra_fields": { - "id": "0x00805e85ca185f935cb7248b58bac2528ec7457ef1b10baf8ef03d9a237d46e4", + "id": "0xdc02ba5b963a4abfa19d98d5fa26b403e524459578a26a38ba34fae89fd2b66c", "size": "0" } }, "voting_power": "10000", - "operation_cap_id": "0xcf955500c82314d83e8abfeb712e306c5acccfc8b77b754b0e9bd8f921b9da43", + "operation_cap_id": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a", "gas_price": "1000", "staking_pool": { - "id": "0x37e12b05c5ead707489d81b4fa16d6ce0031fb7a55dd22ba7855fa621b2aeea0", + "id": "0x73877815d01eb79ccc8d3936b33dd91c9776b70a9a972a245dd0348278dd34fe", "activation_epoch": "0", "deactivation_epoch": null, "iota_balance": "1500000000000000", @@ -971,14 +975,14 @@ Response: { }, "pool_token_balance": "1500000000000000", "exchange_rates": { - "id": "0x08e7a0374786bdb308e5b6f3d0ff0147f9ee5bc9de1272c52db9eadb75b4575c", + "id": "0xb9b7eef578fca16ef4a12c18c5c2ba34e02456c143e1200a77b3ed4343542cce", "size": "1" }, "pending_stake": "0", "pending_total_iota_withdraw": "0", "pending_pool_token_withdraw": "0", "extra_fields": { - "id": "0xd42abafef5e951452dec95b36dfe8e14510e15645f6c47c47efa5208c34b3f82", + "id": "0xd77de5a6f0cd42d4af49f6e1026fac1d903bdec27b7d7db1655d4bae7fc0da91", "size": "0" } }, @@ -987,35 +991,35 @@ Response: { "next_epoch_gas_price": "1000", "next_epoch_commission_rate": "200", "extra_fields": { - "id": "0x2bd3bc51297bd1883a039d0bec2cb160519df1a2cb4b228a1127e7e93fdf9746", + "id": "0xe39145cecdb319f4011b183f128d6c1ea7297e1368b585fe153725e5cda8a3cf", "size": "0" } } ], "pending_active_validators": { "contents": { - "id": "0x76cf61f73bf4d578aaafe61a3cb91654e64880da7a4ecbbf82c955df78345308", + "id": "0x74f4b1b3b2e4743f69de0d1f1c70c2dd93148306666afc9b72bdcc15b35c219f", "size": "0" } }, "pending_removals": [], "staking_pool_mappings": { - "id": "0xa8ddddc49351578fdd00675f868dba2ede333982acd3ce615c6e5387709ee5e2", + "id": "0x915b7f830ca364410ce070137b5b9fe609ac5a7d08320090484bec44110c42a1", "size": "1" }, "inactive_validators": { - "id": "0x529312e17eba8de6ec856216eb76f9a69ed9397511d4e51941c2a55b7d5f223b", + "id": "0xcf0642d199c09a72bad034a642765769a95a7c146fd026a9edf8a63fa7b223b1", "size": "0" }, "validator_candidates": { - "id": "0x7a241a22465736e41d283817bea8d8775f887ad91a7ae893a129c22d660a4ab6", + "id": "0x67ff1104032b479598188affaf00529afbcdd1b1e90ce583020c6bfab657b4a9", "size": "0" }, "at_risk_validators": { "contents": [] }, "extra_fields": { - "id": "0x2275e20fa9aa92c01701edc97925b0c2cdfcc57d1da108087b1c7f25b700c7a4", + "id": "0x5abbfe1fc28887ee84063b633ed935d4020dda7c660c3eea33fd7322146766a7", "size": "0" } }, @@ -1036,7 +1040,7 @@ Response: { "validator_very_low_stake_threshold": "1000000000000000", "validator_low_stake_grace_period": "7", "extra_fields": { - "id": "0x98fda9947bae7fd10900d9b916e94e08699cf7bc4a7f099ba1f3836926278fab", + "id": "0x3198c51012892833039e0c4bc592c2f965d592d6a8d762564cbf3011b3478a2d", "size": "0" } }, @@ -1055,7 +1059,7 @@ Response: { "safe_mode_non_refundable_storage_fee": "0", "epoch_start_timestamp_ms": "0", "extra_fields": { - "id": "0xb96b62cd4f66eb8a3c32f8ffa29697b8d4a1209f7fa9c9aaf01947b2ebb92a1d", + "id": "0xb5a0ba748635636e6234143857cd292ede2d029680d5d31e85edf6b07dd642d2", "size": "0" } } @@ -1068,51 +1072,19 @@ Response: { { "cursor": "eyJpIjoxMywiYyI6MH0", "node": { - "address": "0x7e41c686d7c309827999e66c7cbaabfe1e7428458dab9f7e93dc1abbb6c64157", + "address": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" }, "json": { - "id": "0x7e41c686d7c309827999e66c7cbaabfe1e7428458dab9f7e93dc1abbb6c64157", - "fields": { - "contents": [ - { - "key": "name", - "value": "{immutable_metadata.name}" - }, - { - "key": "image_url", - "value": "{immutable_metadata.uri}" - }, - { - "key": "description", - "value": "{immutable_metadata.description}" - }, - { - "key": "creator", - "value": "{immutable_metadata.issuer_name}" - }, - { - "key": "version", - "value": "{immutable_metadata.version}" - }, - { - "key": "media_type", - "value": "{immutable_metadata.media_type}" - }, - { - "key": "collection_name", - "value": "{immutable_metadata.collection_name}" - }, - { - "key": "immutable_issuer", - "value": "{immutable_issuer}" - } - ] - }, - "version": 1 + "id": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44", + "name": "0", + "value": { + "iota_amount": "0", + "pool_token_amount": "0" + } } } }, @@ -1122,15 +1094,15 @@ Response: { { "cursor": "eyJpIjoxNCwiYyI6MH0", "node": { - "address": "0xc1ea833a9381cdb3d00f7eb3c38b0603c94814031257a74bbfa0148ec788f881", + "address": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>" }, "json": { - "id": "0xc1ea833a9381cdb3d00f7eb3c38b0603c94814031257a74bbfa0148ec788f881", - "name": "0x37e12b05c5ead707489d81b4fa16d6ce0031fb7a55dd22ba7855fa621b2aeea0", + "id": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69", + "name": "0x73877815d01eb79ccc8d3936b33dd91c9776b70a9a972a245dd0348278dd34fe", "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" } } @@ -1141,16 +1113,20 @@ Response: { { "cursor": "eyJpIjoxNSwiYyI6MH0", "node": { - "address": "0xc22d782d6b686022721c7a680612c20817b6cad04210f7df35e471dfd78881f8", + "address": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" }, "json": { - "id": "0xc22d782d6b686022721c7a680612c20817b6cad04210f7df35e471dfd78881f8", - "balance": { - "value": "300000000000000" + "id": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9", + "name": "1", + "value": { + "version": "1", + "epoch": "0", + "randomness_round": "0", + "random_bytes": [] } } } @@ -1161,18 +1137,16 @@ Response: { { "cursor": "eyJpIjoxNiwiYyI6MH0", "node": { - "address": "0xc39644d3d20f6965de0f07b7fd8a02a283f87b04a3401668f3c87c57208c253c", + "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xc39644d3d20f6965de0f07b7fd8a02a283f87b04a3401668f3c87c57208c253c", - "pool_id": "0x37e12b05c5ead707489d81b4fa16d6ce0031fb7a55dd22ba7855fa621b2aeea0", - "stake_activation_epoch": "0", - "principal": { - "value": "1500000000000000" + "id": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8", + "balance": { + "value": "300000000000000" } } } @@ -1183,18 +1157,16 @@ Response: { { "cursor": "eyJpIjoxNywiYyI6MH0", "node": { - "address": "0xcc39f8b8e9648f8bf95a9782944f86b4eadb45f965da8fadcc27c99968d905d1", + "address": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xcc39f8b8e9648f8bf95a9782944f86b4eadb45f965da8fadcc27c99968d905d1", - "name": "0", - "value": { - "iota_amount": "0", - "pool_token_amount": "0" + "id": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa", + "balance": { + "value": "30000000000000000" } } } @@ -1205,15 +1177,19 @@ Response: { { "cursor": "eyJpIjoxOCwiYyI6MH0", "node": { - "address": "0xcf955500c82314d83e8abfeb712e306c5acccfc8b77b754b0e9bd8f921b9da43", + "address": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b", "asMoveObject": { "contents": { "type": { - "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap" + "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota" }, "json": { - "id": "0xcf955500c82314d83e8abfeb712e306c5acccfc8b77b754b0e9bd8f921b9da43", - "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80" + "id": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b", + "pool_id": "0x73877815d01eb79ccc8d3936b33dd91c9776b70a9a972a245dd0348278dd34fe", + "stake_activation_epoch": "0", + "principal": { + "value": "1500000000000000" + } } } }, @@ -1223,14 +1199,14 @@ Response: { { "cursor": "eyJpIjoxOSwiYyI6MH0", "node": { - "address": "0xe6ad211c1ac09d032251d184db0824f16ad0de8b858bff0e046fde919a88c08b", + "address": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c", "asMoveObject": { "contents": { "type": { "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>" }, "json": { - "id": "0xe6ad211c1ac09d032251d184db0824f16ad0de8b858bff0e046fde919a88c08b", + "id": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c", "decimals": 9, "name": "IOTA", "symbol": "IOTA", @@ -1284,7 +1260,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "digest": "7AUMJwqfXbAV3GZbGjPeBK6NCUXxMxxUz62TS6MjhMY3" + "digest": "H5sXqQ1xWAnDFG5s5jAXvhJcjwPamEaEMWPrZ85BqohT" } }, { @@ -1293,7 +1269,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000002", - "digest": "HpTrU3csg7qRB1TcgBzeW2WYofPQD1ySZYhLawsdQNZ3" + "digest": "CtqfTgZVZ4ZnQzZHKg7aBVrCWDdQKTHQhadcd2XmdA9y" } }, { @@ -1302,7 +1278,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000003", - "digest": "4mnkQWk7TkeTQb2WpD3cJekf9W6Nyd1SJKoC4FeDGzxN" + "digest": "DaBy9yCgTn37Ppv4fikHLqPdqV8F7kJf7URfxCtF2e9j" } }, { @@ -1311,7 +1287,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000005", - "digest": "81HKA2Xi48k1v9QnhvgAXDxT7kVE2S39XyiNYH48kVWw" + "digest": "2V6tZ9pU4S3NsRdULriF7GydGmp457uSo2ty4ymB8VXY" } }, { @@ -1320,7 +1296,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000006", - "digest": "3RsTZi66r7dDbcgMMQS8oxFcAbpEnfS61Piehj7peK8p" + "digest": "GqqdRNHyEjeByAbjVkot27KpXPiaJEWZem6dnK2x5rV7" } }, { @@ -1329,7 +1305,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000008", - "digest": "FKGW6NDeitr9gStJ58iCZjf3yrSNLKaRTkNKgtAsCYm6" + "digest": "GxD19fC6Py3PdLE53C5QXaHgnabfWSnMcmasRjreF5RY" } }, { @@ -1338,7 +1314,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000000b", - "digest": "C1nWqcKgwnjhZbi72fNL7cxE7CNGmrHR3KgZzs8a2V9h" + "digest": "6wVDVa1i8WYteTiiE3bPziuY56LBv7Pwc4ji8bqWT7aN" } }, { @@ -1347,7 +1323,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x0000000000000000000000000000000000000000000000000000000000000403", - "digest": "3oJWhcHhvgF3jCztsz9SCmPe7RpH5obzzqQVvwF7x5bg" + "digest": "65TQgghKFiqF7tVcNmkH9TWYzN97WztTBSSsp4WvPrrw" } }, { @@ -1356,34 +1332,34 @@ Response: { "idDeleted": false, "outputState": { "address": "0x000000000000000000000000000000000000000000000000000000000000107a", - "digest": "vVxaoTtVnsooFc5CejECwfwQJAiqYAzF83VLw6zEdyL" + "digest": "67XCsKueapC65naS4Lq7a9a8WkzoKEmzWGsYz9vAenzc" } }, { - "address": "0x17c0381ca02ae48b3a0819b083e43663e17be2e3936fbf06aad42e97c3065a08", + "address": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x17c0381ca02ae48b3a0819b083e43663e17be2e3936fbf06aad42e97c3065a08", - "digest": "CU68h6AHL2gKsmGFagWeVudqNE2Qx5UdXVKfcKn8tSZm" + "address": "0x4209edfee0c6722b4b85e7a15111755c97bc1a8fba7977645cbfa07792b077a3", + "digest": "FeZa7xVC7qyZFN8GXCtJXXSyesfFBC5AUjF2dAHePsnr" } }, { - "address": "0x3017347a061e7145034c803925f9a84e7e2fc1a24f09d1701996d9fb66a970f2", + "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x3017347a061e7145034c803925f9a84e7e2fc1a24f09d1701996d9fb66a970f2", - "digest": "J59wYRtmpiePR5UDoTV8kaBRh5CrhpGdNF2DT3k6GEv6" + "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", + "digest": "89TEkZDyktBqQQM3ZGZUAKJX6NetVgcY1yzdro4WopPg" } }, { - "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", + "address": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f", - "digest": "Eo6p1RYX5B1WoBPTQUfCkYCn5q7FySXmcKsSktiGyVXf" + "address": "0x5d2928d23a808841308e3097bf834a2326f98a9bc147c7cf2df7506ff80e641a", + "digest": "8UAy9EsUau2MkqGAPHDgvf8yzPJzPD21yx8LSgFpuu8N" } }, { @@ -1392,70 +1368,70 @@ Response: { "idDeleted": false, "outputState": { "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "digest": "FZgiUDrLxJ1AkaefGfkYnoJwj2vqeLQYVotu3F4yKvTz" + "digest": "3NNP2MZAhHjVhW6FUkczN9FjkBgoMFb3D3aBoqrzFaWW" } }, { - "address": "0x7e41c686d7c309827999e66c7cbaabfe1e7428458dab9f7e93dc1abbb6c64157", + "address": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x7e41c686d7c309827999e66c7cbaabfe1e7428458dab9f7e93dc1abbb6c64157", - "digest": "9ufGyP4K6jwDAoqdrnVoXzBa1gabT9W1kiqcM8WaUrzQ" + "address": "0x6e7a627fd970b3b88fca49b258fd01ee48509b2b9a35a6d2fc496d62b7feff44", + "digest": "JBCMmBnr6HvySXPCx3tgUYfAe64poHAD9NzMDW2MAw1s" } }, { - "address": "0xc1ea833a9381cdb3d00f7eb3c38b0603c94814031257a74bbfa0148ec788f881", + "address": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc1ea833a9381cdb3d00f7eb3c38b0603c94814031257a74bbfa0148ec788f881", - "digest": "HPavCU471E8BQrDKenuuajjrRxsvPfr17szocdA8sTqw" + "address": "0x9c800dae0d735e34c71f729420132d502854f801f4585606f03455e375f1bc69", + "digest": "Cg7vTwxEaCQykuxHDhTWU2T1TMP2xa8fKnEM4vJ3XL1z" } }, { - "address": "0xc22d782d6b686022721c7a680612c20817b6cad04210f7df35e471dfd78881f8", + "address": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc22d782d6b686022721c7a680612c20817b6cad04210f7df35e471dfd78881f8", - "digest": "CGonGq6ZmRevWZGyfQHiZiitHu3zFaj1NeB8QVZXKCuC" + "address": "0x9ce49a5c6edce2595528dd97fe8cbd53138a8dbee20810d941a396bfb915b9f9", + "digest": "Fe5D4zYiUR4u9uYB9cAWXr2HRSV92bL3BUAw2vA8SH33" } }, { - "address": "0xc39644d3d20f6965de0f07b7fd8a02a283f87b04a3401668f3c87c57208c253c", + "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xc39644d3d20f6965de0f07b7fd8a02a283f87b04a3401668f3c87c57208c253c", - "digest": "7WAP6vZLa2BKZKUo4VJtePxN7Q5HHza9hvN9CZTPN8mV" + "address": "0xa6544a66698c9baad5259e89ee9858db835ed8f099bc032fbfcb1f73e8377ae8", + "digest": "8DSGgS8szoRftGiFFtdqgWNB2XmaF6qtczRKgj1Zkenn" } }, { - "address": "0xcc39f8b8e9648f8bf95a9782944f86b4eadb45f965da8fadcc27c99968d905d1", + "address": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xcc39f8b8e9648f8bf95a9782944f86b4eadb45f965da8fadcc27c99968d905d1", - "digest": "GndbqhHuzKrEnUBmG84cZipkv5pELF22QyN6jLecQYMp" + "address": "0xab8b65fa8ccce42a31f28133855ce3e84f5bf316b15b8177c1a81a0b3c524faa", + "digest": "Gaf625KrgvnGquoHpLnu9V4PxCPLrXjaPAj6TNUoAi9i" } }, { - "address": "0xcf955500c82314d83e8abfeb712e306c5acccfc8b77b754b0e9bd8f921b9da43", + "address": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xcf955500c82314d83e8abfeb712e306c5acccfc8b77b754b0e9bd8f921b9da43", - "digest": "DjtuAynxT1S1qNbkD8Q3WWQ5qQFa7yQt8LY2b92SrSh2" + "address": "0xaf0555cf30fe85c731be9c7feac04bd88ceab245d36fc6952ce1c7ad662e032b", + "digest": "FW486vMb4Q85vApfnZqm85zay37DDwMq5xpJnEQrduo3" } }, { - "address": "0xe6ad211c1ac09d032251d184db0824f16ad0de8b858bff0e046fde919a88c08b", + "address": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0xe6ad211c1ac09d032251d184db0824f16ad0de8b858bff0e046fde919a88c08b", - "digest": "ANXdBfsXeJLMBjj7e5KHjFibA682VkZeZiPVF4BqKi2u" + "address": "0xc04784618c2abcf1a672b8eed0b32b0c82399a1949449fa1780894d96947112c", + "digest": "DygRNA82cC3hz4NnVnneEWu1VVkCbbVdspUJq8renRpv" } } ] @@ -1477,7 +1453,7 @@ Response: { "sequenceNumber": 0 }, "transactionBlock": { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } }, "expiration": null @@ -1529,7 +1505,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } ] }, @@ -1629,7 +1605,7 @@ Response: { "dependencies": { "nodes": [ { - "digest": "Cpgs1hPAQs2nfbQkD2ZsEfEAvmtTjb7QT5mtXaMQwhgD" + "digest": "3i3tgknuHtmwGpo2ybxbvVmBUsTWpaaWvKxbEKzc279Q" } ] }, @@ -1653,16 +1629,16 @@ Response: { "idDeleted": false, "outputState": { "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d", - "digest": "5eggD92os4DP51u7VHtJppCaPUwWZ7TLkWBJ5j5FJ23r" + "digest": "BSa7PKAWVFZob5cE6nN1JWtoG5v45m2w8WVTQ8SxMxeY" } }, { - "address": "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1", + "address": "0x68eb1d10bdcf35211aafe684fe3568824238bdee9ec5e350c69990bb6d2d8c1d", "idCreated": true, "idDeleted": false, "outputState": { - "address": "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1", - "digest": "ARKR7Cs2VVxPWp8x97Wn9PKSpKSv6GktUezxyfpAeGay" + "address": "0x68eb1d10bdcf35211aafe684fe3568824238bdee9ec5e350c69990bb6d2d8c1d", + "digest": "FZvmYvoCZAtb7pk1EDNGMzN7rFiSRGu9zrYnYFZVMRJm" } }, { @@ -1671,16 +1647,7 @@ Response: { "idDeleted": false, "outputState": { "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2", - "digest": "GS7ZfUqukn49TvLTvEYmxcHxZmd72CGCyt6HvmybQK1e" - } - }, - { - "address": "0x7d8c6c48df3647d66b321d7cd97635b53d8dcc6b1c4253b3f90a0d0875eca7bf", - "idCreated": true, - "idDeleted": false, - "outputState": { - "address": "0x7d8c6c48df3647d66b321d7cd97635b53d8dcc6b1c4253b3f90a0d0875eca7bf", - "digest": "DAdadQkCUYJUSXVnVzAtcHg91AVYQf3ofKqZMSZrcqNz" + "digest": "33Bg8QUCxGNcSJ5xCZ1wVEWrFomUAyANogxuJYvnKjAB" } } ] From d5fdd6e1913d4ed85f4750d632221242c4ddff2a Mon Sep 17 00:00:00 2001 From: miker83z Date: Fri, 25 Oct 2024 18:03:54 +0200 Subject: [PATCH 57/62] fix(iota-framework-snapshot): update manifest --- crates/iota-framework-snapshot/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/iota-framework-snapshot/manifest.json b/crates/iota-framework-snapshot/manifest.json index 6273bb2a3c6..5fc48001399 100644 --- a/crates/iota-framework-snapshot/manifest.json +++ b/crates/iota-framework-snapshot/manifest.json @@ -1,6 +1,6 @@ { "1": { - "git_revision": "679ea04679f2", + "git_revision": "79d2e3399d20", "package_ids": [ "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002", From c6bd1575ae3bc825074dfa1167dcaf422ef87abf Mon Sep 17 00:00:00 2001 From: salaheldinsoliman <49910731+salaheldinsoliman@users.noreply.github.com> Date: Mon, 28 Oct 2024 12:01:57 +0100 Subject: [PATCH 58/62] feat(docs): add interactive CTF challenges to docs (#3014) * fix(docs): add refs to related articles Signed-off-by: salaheldinsoliman * fix(docs): update readme of challneges Signed-off-by: salaheldinsoliman * feat(docs): Add related articles and Hints Signed-off-by: salaheldinsoliman * feat(docs): Add related articles and Hints Signed-off-by: salaheldinsoliman * Apply suggestions from code review Co-authored-by: Lucas Tortora <85233773+lucas-tortora@users.noreply.github.com> * feat(docs): Change info to tip Signed-off-by: salaheldinsoliman * feat(docs): Change info to tip Signed-off-by: salaheldinsoliman * fix(docs): broken links Signed-off-by: salaheldinsoliman * fix(docs): apply dprint Signed-off-by: salaheldinsoliman --------- Signed-off-by: salaheldinsoliman Co-authored-by: Lucas Tortora <85233773+lucas-tortora@users.noreply.github.com> --- .../developer/iota-move-ctf/challenge_1.mdx | 41 ++++++ .../developer/iota-move-ctf/challenge_2.mdx | 46 ++++++ .../developer/iota-move-ctf/challenge_3.mdx | 48 +++++++ .../developer/iota-move-ctf/challenge_4.mdx | 49 +++++++ .../developer/iota-move-ctf/challenge_5.mdx | 39 +++++ .../developer/iota-move-ctf/challenge_6.mdx | 47 ++++++ .../developer/iota-move-ctf/challenge_7.mdx | 38 +++++ .../developer/iota-move-ctf/challenge_8.mdx | 56 ++++++++ .../developer/iota-move-ctf/introduction.mdx | 65 +++++++++ docs/content/sidebars/developer.js | 18 +++ docs/examples/move/ctf/README.md | 30 ++++ docs/examples/move/ctf/challenge_1/Move.toml | 11 ++ docs/examples/move/ctf/challenge_1/README.md | 3 + .../move/ctf/challenge_1/sources/checkin.move | 14 ++ docs/examples/move/ctf/challenge_2/Move.toml | 11 ++ docs/examples/move/ctf/challenge_2/README.md | 3 + .../move/ctf/challenge_2/sources/counter.move | 45 ++++++ .../ctf/challenge_2/sources/luckynumber.move | 23 +++ docs/examples/move/ctf/challenge_3/Move.toml | 11 ++ docs/examples/move/ctf/challenge_3/README.md | 3 + .../move/ctf/challenge_3/sources/counter.move | 45 ++++++ .../move/ctf/challenge_3/sources/mint.move | 39 +++++ docs/examples/move/ctf/challenge_4/Move.toml | 11 ++ docs/examples/move/ctf/challenge_4/README.md | 3 + .../move/ctf/challenge_4/sources/airdrop.move | 67 +++++++++ .../move/ctf/challenge_4/sources/counter.move | 45 ++++++ docs/examples/move/ctf/challenge_5/Move.toml | 11 ++ docs/examples/move/ctf/challenge_5/README.md | 3 + .../move/ctf/challenge_5/package.json | 8 ++ .../move/ctf/challenge_5/sources/pizza.move | 54 +++++++ docs/examples/move/ctf/challenge_6/Move.toml | 11 ++ docs/examples/move/ctf/challenge_6/README.md | 3 + .../move/ctf/challenge_6/sources/pizza.move | 50 +++++++ .../move/ctf/challenge_6/sources/recycle.move | 59 ++++++++ docs/examples/move/ctf/challenge_7/Move.toml | 11 ++ docs/examples/move/ctf/challenge_7/README.md | 3 + .../move/ctf/challenge_7/package.json | 8 ++ .../move/ctf/challenge_7/sources/ptb.move | 29 ++++ docs/examples/move/ctf/challenge_8/Move.toml | 11 ++ docs/examples/move/ctf/challenge_8/README.md | 3 + .../ctf/challenge_8/sources/firstcoin.move | 34 +++++ .../ctf/challenge_8/sources/secondcoin.move | 34 +++++ .../move/ctf/challenge_8/sources/vault.move | 93 ++++++++++++ docs/examples/move/ctf/deploy.py | 110 ++++++++++++++ docs/examples/move/ctf/verifier/Move.toml | 11 ++ docs/examples/move/ctf/verifier/README.md | 3 + .../move/ctf/verifier/sources/verifier.move | 134 ++++++++++++++++++ docs/site/src/components/CTF/ctf-verifier.tsx | 94 ++++++++++++ 48 files changed, 1588 insertions(+) create mode 100644 docs/content/developer/iota-move-ctf/challenge_1.mdx create mode 100644 docs/content/developer/iota-move-ctf/challenge_2.mdx create mode 100644 docs/content/developer/iota-move-ctf/challenge_3.mdx create mode 100644 docs/content/developer/iota-move-ctf/challenge_4.mdx create mode 100644 docs/content/developer/iota-move-ctf/challenge_5.mdx create mode 100644 docs/content/developer/iota-move-ctf/challenge_6.mdx create mode 100644 docs/content/developer/iota-move-ctf/challenge_7.mdx create mode 100644 docs/content/developer/iota-move-ctf/challenge_8.mdx create mode 100644 docs/content/developer/iota-move-ctf/introduction.mdx create mode 100644 docs/examples/move/ctf/README.md create mode 100644 docs/examples/move/ctf/challenge_1/Move.toml create mode 100644 docs/examples/move/ctf/challenge_1/README.md create mode 100644 docs/examples/move/ctf/challenge_1/sources/checkin.move create mode 100644 docs/examples/move/ctf/challenge_2/Move.toml create mode 100644 docs/examples/move/ctf/challenge_2/README.md create mode 100644 docs/examples/move/ctf/challenge_2/sources/counter.move create mode 100644 docs/examples/move/ctf/challenge_2/sources/luckynumber.move create mode 100644 docs/examples/move/ctf/challenge_3/Move.toml create mode 100644 docs/examples/move/ctf/challenge_3/README.md create mode 100644 docs/examples/move/ctf/challenge_3/sources/counter.move create mode 100644 docs/examples/move/ctf/challenge_3/sources/mint.move create mode 100644 docs/examples/move/ctf/challenge_4/Move.toml create mode 100644 docs/examples/move/ctf/challenge_4/README.md create mode 100644 docs/examples/move/ctf/challenge_4/sources/airdrop.move create mode 100644 docs/examples/move/ctf/challenge_4/sources/counter.move create mode 100644 docs/examples/move/ctf/challenge_5/Move.toml create mode 100644 docs/examples/move/ctf/challenge_5/README.md create mode 100644 docs/examples/move/ctf/challenge_5/package.json create mode 100644 docs/examples/move/ctf/challenge_5/sources/pizza.move create mode 100644 docs/examples/move/ctf/challenge_6/Move.toml create mode 100644 docs/examples/move/ctf/challenge_6/README.md create mode 100644 docs/examples/move/ctf/challenge_6/sources/pizza.move create mode 100644 docs/examples/move/ctf/challenge_6/sources/recycle.move create mode 100644 docs/examples/move/ctf/challenge_7/Move.toml create mode 100644 docs/examples/move/ctf/challenge_7/README.md create mode 100644 docs/examples/move/ctf/challenge_7/package.json create mode 100644 docs/examples/move/ctf/challenge_7/sources/ptb.move create mode 100644 docs/examples/move/ctf/challenge_8/Move.toml create mode 100644 docs/examples/move/ctf/challenge_8/README.md create mode 100644 docs/examples/move/ctf/challenge_8/sources/firstcoin.move create mode 100644 docs/examples/move/ctf/challenge_8/sources/secondcoin.move create mode 100644 docs/examples/move/ctf/challenge_8/sources/vault.move create mode 100644 docs/examples/move/ctf/deploy.py create mode 100644 docs/examples/move/ctf/verifier/Move.toml create mode 100644 docs/examples/move/ctf/verifier/README.md create mode 100644 docs/examples/move/ctf/verifier/sources/verifier.move create mode 100644 docs/site/src/components/CTF/ctf-verifier.tsx diff --git a/docs/content/developer/iota-move-ctf/challenge_1.mdx b/docs/content/developer/iota-move-ctf/challenge_1.mdx new file mode 100644 index 00000000000..ab3b6f588b4 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_1.mdx @@ -0,0 +1,41 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 1: Checkin + +In this first challenge, your task is to interact with a basic Move contract. The contract defines a `Flag` object, which you need to retrieve by calling a specific function. + +The contract mints a new flag and transfers it to your account. Your goal is to [call the function](../getting-started/publish.mdx#accessing-your-package), capture the flag, and then submit the object ID to verify your success. + +This challenge is designed to be an easy introduction, guiding you through the process of interacting with the blockchain, calling functions, and understanding the basics of flag capture. + + +## Deployed Contract Address: +``` +Package: 0xce9b1471301ffaf1453297cca008a68ce851b6a9ba9ab241c357c346177903f3 +``` + +## Contracts +### `checkin.move` +```move file=/docs/examples/move/ctf/challenge_1/sources/checkin.move +``` + + +## Related Articles + +In this challenge, you must use the IOTA CLI to interact with the blockchain. This set of articles will help you set up your environment and call a deployed contract: + +- [Installing IOTA CLI](../getting-started/install-iota.mdx) +- [Connecting to Alphanet](../getting-started/connect.mdx) +- [Get Iota coins](../getting-started/get-coins.mdx) +- [Accessing Your Package](../getting-started/publish.mdx#accessing-your-package) + + +Good luck in capturing your first flag! + + + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/challenge_2.mdx b/docs/content/developer/iota-move-ctf/challenge_2.mdx new file mode 100644 index 00000000000..1c06d6d564b --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_2.mdx @@ -0,0 +1,46 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 2: Lucky Number + +In this challenge you are supposed to get the flag Event by passing in the right parameters to the `get_flag` function in the `luckynumber` module. If you do this correctly you should get a Flag event in return. + + + +## Deployed Contract Addresses: +``` +Package: 0xb13a3cd66c6aa2ccff512fee9d950176acf0835fbf2091fa32e789d44baabe01 +Counter: 0x88c94654907f9daabbc25e9724997bd71a16e13f55cc4580f5e7c207e3ff28f2 +``` + +## Contracts +### `luckynumber.move` +```move file=/docs/examples/move/ctf/challenge_2/sources/luckynumber.move +``` + +### `counter.move` +```move file=/docs/examples/move/ctf/challenge_2/sources/counter.move +``` + + +## Related Articles +In this stage of the CTF, you should be familiar with how to use the CLI to call a Move function and pass in the right parameters, as well as a general understanding of the Object Model: + +- [IOTA CLI reference](../../references/cli/) +- [Object Model](../iota-101/objects/object-model.mdx) + + + +:::tip +You should check how to use the CLI to call a function in a module and pass in the right parameters. `iota client call --help` might help. +::: + + +Good luck in capturing your second flag! + + + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/challenge_3.mdx b/docs/content/developer/iota-move-ctf/challenge_3.mdx new file mode 100644 index 00000000000..3186d0c6319 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_3.mdx @@ -0,0 +1,48 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 3: MintCoin Mechanics + +In this challenge, you'll dive into the mechanics of "MintCoin," a [coin](../standards/coin.mdx) that allows anyone to mint new tokens using a "Proof of Move" process. However, minting alone will not be enough to get the flag—you'll need to go a step further. + +Your goal is to understand how the system works and figure out the extra steps needed to successfully retrieve the flag. + + +## Deployed Contract Addresses: +``` +CoinMetadata<0xf84628ac335e59ce6e305835cc09c0b9983d7b1695ab28e96cf875b49923e4ed::mintcoin::MINTCOIN>: 0x1bd5dfa2e5f1d3a3825403d92b8199ce3f69a5e70a785f28d698715b54d78321 +Counter: 0xe7877309899ef0618ea0e269327f79e3bdf38ff2860fd01f5d278b46ea8cd630 +TreasuryCap<0xf84628ac335e59ce6e305835cc09c0b9983d7b1695ab28e96cf875b49923e4ed::mintcoin::MINTCOIN>: 0xf3cb314954f0823961fdfe93ba9403314b4c53bb654f73ba37fe3c8400831e23 +Package: 0xf84628ac335e59ce6e305835cc09c0b9983d7b1695ab28e96cf875b49923e4ed +``` + +## Contracts + +#### `mint.move` +```move file=/docs/examples/move/ctf/challenge_3/sources/mint.move +``` + +#### `counter.move` +```move file=/docs/examples/move/ctf/challenge_3/sources/counter.move +``` + + +## Related Articles +This challenge's main contract is written using the Coin Standard. Having been familiar with the [Object Model](../iota-101/objects/object-model.mdx) from the last challenge, you should now be able to understand the Coin Standard and how it works. + +- [Coin Standard](../standards/coin.mdx) + + + +:::tip +Your starting point should be the function `get_flag` in the `mint` module to understand the steps required to capture the flag. To successfully complete the challenge, make sure to follow the contract's logic and requirements. +::: + +Good luck in capturing your third flag! + + + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/challenge_4.mdx b/docs/content/developer/iota-move-ctf/challenge_4.mdx new file mode 100644 index 00000000000..2442c2b30a8 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_4.mdx @@ -0,0 +1,49 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 4: Airdrop + +Your mission is to participate in the "Horse Token" airdrop and capture the elusive flag. You'll need to mint some Horse Tokens and claim your share through the airdrop mechanism. But simply collecting tokens won’t be enough—securing the flag requires a bit more effort. + +Use your command line expertise to interact with the system, track your progress, and perform key actions efficiently. Pay close attention to the airdrop logic, as understanding how the token distribution works will be crucial to successfully capturing the flag. + +## Deployed Contract Addresses: +``` +CoinMetadata<0x913ddcf84345bc087530e0b5d8b183780ecf902ea6cfa64b62d3f8a349ebafd9::airdrop::AIRDROP>: 0x163ef67f9631eea22ef33e58aab3e0d5c243184335e943047c28cb0a30985cf0 +Vault: 0x4ae07fd00773080f9af2e43c2464667536d661ba0001a670e3971efbb01446e2 +Package: 0x913ddcf84345bc087530e0b5d8b183780ecf902ea6cfa64b62d3f8a349ebafd9 +TreasuryCap<0x913ddcf84345bc087530e0b5d8b183780ecf902ea6cfa64b62d3f8a349ebafd9::airdrop::AIRDROP>: 0xa9b65a0be78472f053298980a4fae935d12571731bfd7be3b9d41183a7f100ff +Counter: 0xc96bfaf42e3b8b1f2e5dbf469dc5f7846c911dbbb76966475cfd06cf3893b080 +``` + +## Contracts + +### `airdrop.move` +```move file=/docs/examples/move/ctf/challenge_4/sources/airdrop.move +``` + +### `counter.move` +```move file=/docs/examples/move/ctf/challenge_4/sources/counter.move +``` + +## Related Articles +Challenges 1-3 have introduced you to the basics of interacting with Move contracts, the Object Model, and the Coin Standard. In this challenge, you'll need to apply your knowledge to a more complex scenario involving an airdrop mechanism. +This challnege can be solved with IOTA PTBs, which will also help you in further challenges. + +- [Coin Standard](../standards/coin.mdx) +- [Object Model](../iota-101/objects/object-model.mdx) +- [Programmable Transaction Blocks](../iota-101/transactions/ptb/working-with-ptbs.mdx) + + + +Good luck in capturing your fourth flag! + + +:::tip +Under `Deployed Contract Addresses`, you can find the addresses of the package as well as the `Vault`. Carefully check what the constraints are for the `get_flag` function to work, as it has some assertions that need to be met. +::: + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/challenge_5.mdx b/docs/content/developer/iota-move-ctf/challenge_5.mdx new file mode 100644 index 00000000000..c8ba92196c2 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_5.mdx @@ -0,0 +1,39 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 5: Perfect Pizza + +When in Italy, pizza is a way of life. Crafted from simple ingredients with an artful touch, only the perfect combination will gain the approval of the pizzaiolo (master pizza maker). Choose your ingredients wisely—anything less than perfection and your creation won’t pass the test. + +In this challenge, you'll need to carefully assemble your pizza using the correct ingredients. The pizzaiolo will judge your creation, and only a perfect pizza will earn you the flag. Attention to detail is key—get it right, or it's back to the kitchen! + +## Deployed Contract Address: +``` +Package: 0x84c3037c252e1b9142087a19c2bd776ee86316775484eb78e9f97618d877a577 +``` + +## Contracts + +### `pizza.move` +```move file=/docs/examples/move/ctf/challenge_5/sources/pizza.move +``` + +:::tip +The pizzaiolo uses [bcs::to_bytes](../../references/framework/iota-framework/bcs.mdx#function-to_bytes) to make sure the ingredients are in order. Make sure you understand how to use this function to pass the test. +::: + + +## Related Articles +Now that your are familiar with the basics of Move, this challenge will introduce a function from the iota-framework which you should be familiar with. +After taking a look at the challenge's usage of [bcs::to_bytes](../../references/framework/iota-framework/bcs.mdx#function-to_bytes), we recommend you to take a look at the IOTA Framework documentation to understand how to use it in further challenges. + +- [IOTA Framework](../../references/framework/iota-framework/) + + +Good luck in capturing your fifth flag! + + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/challenge_6.mdx b/docs/content/developer/iota-move-ctf/challenge_6.mdx new file mode 100644 index 00000000000..05587dd8ca2 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_6.mdx @@ -0,0 +1,47 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 6: Go Recycle! + +The City of Venice is tired of all the trash ending up in the canals, especially pizza boxes still filled with a certain type of pizza which are just dumped everywhere are ruining the experience. They decided to start a recycling program rewarding people who do their part with a Venetian Flag; Go grab one! + +For this challenge you might want to investigate the [Transfer to object](../iota-101/objects/transfers/transfer-to-object.mdx) functionality; Pizzaboxes from previous challenges can not be used in this one. + +## Deployed Contract Addresses: +``` +PizzaBoxRecycler: 0x16ddd3ae8cc4fe71f1acdc52838412a645eac93f1176450d05a77642f1816f34 +Package: 0xcbe251b41a23a3952e64036f01367df82f1ccf3498cb139ff3ef44712441abc9 +``` + +## Contracts + +### recycle.move +```move file=/docs/examples/move/ctf/challenge_6/sources/recycle.move +``` + +### pizza.move +```move file=/docs/examples/move/ctf/challenge_6/sources/pizza.move +``` + + +## Related Articles + +The previous challenges covered the basics of the Object Model and how to interact with the blockchain. This challenge's main theme is object transfers, which will be crucial to capturing the flag. +We recommend you to check the following articles: + +- [Object Transfers](../iota-101/objects/transfers/) +- [Transfer to object](../iota-101/objects/transfers/transfer-to-object.mdx) +- [Custom Transfer Rules](../iota-101/objects/transfers/custom-rules.mdx) + + + +Good luck in capturing your sixth flag! + +:::tip +Make sure you recycle enough pizza boxes! +::: + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/challenge_7.mdx b/docs/content/developer/iota-move-ctf/challenge_7.mdx new file mode 100644 index 00000000000..2e534975317 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_7.mdx @@ -0,0 +1,38 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 7: PTBs + +In response to the recent pizza challenge, the city of Venice has implemented a smart contract to efficiently manage ingredients and prevent hoarding. Participants are invited to utilize these perishable ingredients, which must be used immediately to create dough. + +Your objective is to gather the necessary ingredients—flour, water, yeast, and salt—and craft the dough required to capture the flag. This challenge can be solved using the Move CLI and the [`iota client ptb` command.](../../references/cli/ptb.mdx) + +## Deployed Contract Addresses: +``` +Package: 0x202d65a2b1d2de4ba90e9eeb51ef4e16fafdaaa5c8b1dc3cbd8a935e5eb4d25c +``` + +## Contracts + +### `ptb.move` +```move file=/docs/examples/move/ctf/challenge_7/sources/ptb.move +``` + + +## Related Articles + +This challenge will introduce you to the PTB standard and how to use the Move CLI to interact with it. You should be familiar with the PTB standard and how to use the Move CLI to call the `ptb` function. + +- [PTB Standard](../iota-101/transactions/ptb/working-with-ptbs.mdx) +- [IOTA CLI reference](../../references/cli/ptb.mdx) + + + +Good luck in capturing your seventh flag! + + + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/challenge_8.mdx b/docs/content/developer/iota-move-ctf/challenge_8.mdx new file mode 100644 index 00000000000..66cf831c1b7 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/challenge_8.mdx @@ -0,0 +1,56 @@ + +import ChallengeVerifier from '@site/src/components/CTF/ctf-verifier'; + + + + +# Challenge 8: Flash! + +In this challenge, you will explore a decentralized exchange (DEX) with a critical flaw you can exploit to capture the flag. This exchange operates with two tokens—CTFA and CTFB—and features a vault that allows users to take flash loans. Your objective is to manipulate the token balances effectively to obtain the flag by using the vulnerabilities in the DEX's flash loan mechanism. +To solve this challenge, you will have to have a deep understanding of [programmable transaction blocks (PTBs)](../iota-101/transactions/ptb/prog-txn-blocks.mdx) and how to build them using the [TS SDK](../iota-101/transactions/ptb/building-ptb.mdx) or the [CLI](../../references/cli/ptb.mdx). + +## Deployed Contract Addresses: +``` +MintA<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfa::CTFA>: 0x66e8dd865238a68f50db8be7177ee662b754133f409c35c36975f9d6e6f7f6e4 +MintB<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfb::CTFB>: 0x7c4f0f9d2e62bb0c440e5d281fbac69997dc14e1586cfedcea49f547a54eca1b +Package: 0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33 +CoinMetadata<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfa::CTFA>: 0x8f9c961398fcbfff8b9b1f14e1d6731bcfa2480f7c4f26fbb76496498bcc684e +CoinMetadata<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfb::CTFB>: 0xca909dd26da43ac1d0992ebe796e0714d9382e0e4ec35640a1ac9845b3bb087d +``` + +## Contracts + +### `firstcoin.move` +```move file=/docs/examples/move/ctf/challenge_8/sources/firstcoin.move +``` + +### `secondcoin.move` +```move file=/docs/examples/move/ctf/challenge_8/sources/secondcoin.move +``` + +### `vault.move` +```move file=/docs/examples/move/ctf/challenge_8/sources/vault.move +``` + +Good luck in capturing your eighth flag! + + +## Related Articles +This challenge will test your understanding of the Object Model, the Coin Standard, and PTBs. You will need to use your knowledge of these concepts to exploit the DEX's flash loan mechanism and capture the flag. + +- [Coin Standard](../standards/coin.mdx) +- [Object Model](../iota-101/objects/object-model.mdx) +- [Programmable Transaction Blocks](../iota-101/transactions/ptb/working-with-ptbs.mdx) +- [IOTA CLI reference](../../references/cli/ptb.mdx) +- [IOTA TS SDK reference](../iota-101/transactions/ptb/building-ptb.mdx) + + + +:::tip +The DEX programmer pulled an all-nighter before writing the flash loan mechanism, making a critical mistake. +::: + + + + + \ No newline at end of file diff --git a/docs/content/developer/iota-move-ctf/introduction.mdx b/docs/content/developer/iota-move-ctf/introduction.mdx new file mode 100644 index 00000000000..ab5d39c2c13 --- /dev/null +++ b/docs/content/developer/iota-move-ctf/introduction.mdx @@ -0,0 +1,65 @@ +# Move on IOTA Capture The Flag (CTF) + +The **Move on IOTA Capture The Flag (CTF)** is a unique learning experience designed to help developers master the Move programming language by solving a series of challenges. These challenges simulate real-world scenarios that require participants to find and exploit vulnerabilities, optimize contract logic, and interact with IOTA’s alphanet. Whether you're new to Move or experienced with smart contract development, this CTF is an excellent way to sharpen your skills. + +This CTF features **eight challenges**, each built on Move, a language optimized for safety and scalability in decentralized applications. Throughout the event, participants are encouraged to explore Move’s features, including its resource-based design and transaction scripting model, in a competitive environment. However, bear in mind that the provided demonstration contracts may intentionally include distractions, poor design, and obscure naming conventions to increase difficulty. + +## What to Expect + +- **Varied Difficulty:** The challenges are structured progressively. The lower-numbered challenges are easier, while the difficulty increases as you proceed. +- **No Contract Modification:** Participants are prohibited from modifying the provided contracts; the goal is to interact with them via Move scripts, client libraries, or command-line tools. +- **Explore Move in Depth:** As you tackle these challenges, you'll get hands-on experience with Move’s key features, such as resource management, transaction scripts, and smart contract modules. Each challenge is designed to push you to think critically and apply Move concepts effectively. + + +## Capturing Flags + +Upon successfully completing a challenge, you will receive a "flag," which is a Move object generated as proof of completion. To validate your progress, there will be a submission window where you can enter the ID of the flag object. The system will verify whether the submitted flag is correct or not. Only valid flags will be counted toward your overall score in the CTF. + +## Setup + +The CTF contract are already deployed on the IOTA alphanet. To get started, you need to install the IOTA CLI tool and connect to the alphanet. If you haven't done so already, follow these steps: + +1. [Install the IOTA CLI Tool](../getting-started/install-iota.mdx) +2. [Connect to alphanet](../getting-started/connect.mdx) +3. [Create and Address](../getting-started/get-address.mdx) +4. [Fund Your Address](../getting-started/get-coins.mdx) +5. Get the flags! + + + +## Challenge Addresses + +| Challenge | Entity | Address | +|-------------|------------------------------------------------------------------|----------------------------------------------------------------| +| challenge_1 | Package | `0xce9b1471301ffaf1453297cca008a68ce851b6a9ba9ab241c357c346177903f3` | +| challenge_2 | Counter | `0x88c94654907f9daabbc25e9724997bd71a16e13f55cc4580f5e7c207e3ff28f2` | +| | Package | `0xb13a3cd66c6aa2ccff512fee9d950176acf0835fbf2091fa32e789d44baabe01` | +| challenge_3 | `CoinMetadata<0xf84628ac335e59ce6e305835cc09c0b9983d7b1695ab28e96cf875b49923e4ed::mintcoin::MINTCOIN>` | `0x1bd5dfa2e5f1d3a3825403d92b8199ce3f69a5e70a785f28d698715b54d78321` | +| | Counter | `0xe7877309899ef0618ea0e269327f79e3bdf38ff2860fd01f5d278b46ea8cd630` | +| | `TreasuryCap<0xf84628ac335e59ce6e305835cc09c0b9983d7b1695ab28e96cf875b49923e4ed::mintcoin::MINTCOIN>` | `0xf3cb314954f0823961fdfe93ba9403314b4c53bb654f73ba37fe3c8400831e23` | +| | Package | `0xf84628ac335e59ce6e305835cc09c0b9983d7b1695ab28e96cf875b49923e4ed` | +| challenge_4 | `CoinMetadata<0x913ddcf84345bc087530e0b5d8b183780ecf902ea6cfa64b62d3f8a349ebafd9::airdrop::AIRDROP>` | `0x163ef67f9631eea22ef33e58aab3e0d5c243184335e943047c28cb0a30985cf0` | +| | Vault | `0x4ae07fd00773080f9af2e43c2464667536d661ba0001a670e3971efbb01446e2` | +| | Package | `0x913ddcf84345bc087530e0b5d8b183780ecf902ea6cfa64b62d3f8a349ebafd9` | +| | `TreasuryCap<0x913ddcf84345bc087530e0b5d8b183780ecf902ea6cfa64b62d3f8a349ebafd9::airdrop::AIRDROP>` | `0xa9b65a0be78472f053298980a4fae935d12571731bfd7be3b9d41183a7f100ff` | +| | Counter | `0xc96bfaf42e3b8b1f2e5dbf469dc5f7846c911dbbb76966475cfd06cf3893b080` | +| challenge_5 | Package | `0x84c3037c252e1b9142087a19c2bd776ee86316775484eb78e9f97618d877a577` | +| challenge_6 | PizzaBoxRecycler | `0x16ddd3ae8cc4fe71f1acdc52838412a645eac93f1176450d05a77642f1816f34` | +| | Package | `0xcbe251b41a23a3952e64036f01367df82f1ccf3498cb139ff3ef44712441abc9` | +| challenge_7 | Package | `0x202d65a2b1d2de4ba90e9eeb51ef4e16fafdaaa5c8b1dc3cbd8a935e5eb4d25c` | +| challenge_8 | `MintA<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfa::CTFA>` | `0x66e8dd865238a68f50db8be7177ee662b754133f409c35c36975f9d6e6f7f6e4` | +| | `MintB<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfb::CTFB>` | `0x7c4f0f9d2e62bb0c440e5d281fbac69997dc14e1586cfedcea49f547a54eca1b` | +| | Package | `0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33` | +| | `CoinMetadata<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfa::CTFA>` | `0x8f9c961398fcbfff8b9b1f14e1d6731bcfa2480f7c4f26fbb76496498bcc684e` | +| | `CoinMetadata<0x828a5da05496e86075fab366b2b66ec3ba0a3bfbed68ce56140d589d94da9b33::ctfb::CTFB>` | `0xca909dd26da43ac1d0992ebe796e0714d9382e0e4ec35640a1ac9845b3bb087d` | + +``` +-------------------------------------------------------------------------------- +Package ID for Verifier: 0xdf6b7e52065dc5d4ae29fe212763226ba4e12eae81944d2ae6cf507296a767b1 +CTFCap Object ID: 0xc9ee0b68715c3eb8130e25c2bddd67552e5787cc4271f2a75955aab4b0927b99 +Shared Challenges Object ID: 0x44cabb21a9f66f8ce02c3c4881595bf439c2740c41341c7d257ee41e6238a4a0 +-------------------------------------------------------------------------------- +``` + + + diff --git a/docs/content/sidebars/developer.js b/docs/content/sidebars/developer.js index 3214d7deb9e..b96192b54a1 100644 --- a/docs/content/sidebars/developer.js +++ b/docs/content/sidebars/developer.js @@ -174,6 +174,24 @@ const developer = [ 'developer/iota-101/access-time', ], }, + { + type: 'category', + label: 'Capture The Flag', + link: { + type: 'doc', + id: 'developer/iota-move-ctf/introduction', + }, + items: [ + 'developer/iota-move-ctf/challenge_1', + 'developer/iota-move-ctf/challenge_2', + 'developer/iota-move-ctf/challenge_3', + 'developer/iota-move-ctf/challenge_4', + 'developer/iota-move-ctf/challenge_5', + 'developer/iota-move-ctf/challenge_6', + 'developer/iota-move-ctf/challenge_7', + 'developer/iota-move-ctf/challenge_8', + ], + }, { type: 'category', label: 'Standards', diff --git a/docs/examples/move/ctf/README.md b/docs/examples/move/ctf/README.md new file mode 100644 index 00000000000..700e6412b6f --- /dev/null +++ b/docs/examples/move/ctf/README.md @@ -0,0 +1,30 @@ +# Move on IOTA Capture the Flag (CTF) + +## Trying the Challenges + +The challneges are already deployed on the IOTA alphanet. To get started, you need to start with reading the [CTF introduction](../../docs/content/developer/iota-move-ctf/introduction.mdx), follow its steps to interact with the challenges, and capture the flags. + +## Deploying the challneges yourself (Not Required) + +If you want to experiment further with the contracts or deploy the challenges in your own environment, you can set them up yourself using the provided `deploy.py` script. While this is not required to participate in the CTF, deploying the challenges locally can help you explore the contracts in a controlled environment. + +To deploy the challenges yourself: + +1. **Prepare the Environment:** + - Ensure you have Python 3 installed. + - Install the IOTA CLI tool and ensure it is available in your system's `PATH`. + +2. **Run the Deployment Script:** + - Inside the the CTF directory, run the [`deploy.py`](../../../../examples/ctf/deploy.py). + - The script requires two arguments: + 1. The path to the `iota` binary (the CLI tool you installed earlier). You can can find the path by running `which iota` in your terminal in Linux or macOS, or `where iota` in Windows. + 2. The full path to the CTF repository. + - Example command: + ```bash + python3 deploy.py /path/to/iota /path/to/ctf/repository + ``` + +3. **Interact with the Deployed Contracts:** + - Once the challenges are deployed in your local environment, you can interact with them in a similar way as on the devnet. You’ll be able to submit transactions, test edge cases, and attempt to capture the flags using the deployed contracts. + +This setup allows you to modify the contracts and experiment with different scenarios. diff --git a/docs/examples/move/ctf/challenge_1/Move.toml b/docs/examples/move/ctf/challenge_1/Move.toml new file mode 100644 index 00000000000..6cf34846268 --- /dev/null +++ b/docs/examples/move/ctf/challenge_1/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "checkin" +# version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +# iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_1/README.md b/docs/examples/move/ctf/challenge_1/README.md new file mode 100644 index 00000000000..14c79f1bf6f --- /dev/null +++ b/docs/examples/move/ctf/challenge_1/README.md @@ -0,0 +1,3 @@ +# Challenge 1: Hello World + +This contract is used in the [first challenge](../../../../content/developer/iota-move-ctf/challenge_1.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_1/sources/checkin.move b/docs/examples/move/ctf/challenge_1/sources/checkin.move new file mode 100644 index 00000000000..ab0046142e7 --- /dev/null +++ b/docs/examples/move/ctf/challenge_1/sources/checkin.move @@ -0,0 +1,14 @@ +module ctf::checkin { + + public struct Flag has key, store { + id: UID, + user: address + } + + public entry fun get_flag(ctx: &mut TxContext) { + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/challenge_2/Move.toml b/docs/examples/move/ctf/challenge_2/Move.toml new file mode 100644 index 00000000000..8330faabfb6 --- /dev/null +++ b/docs/examples/move/ctf/challenge_2/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "luckynumber" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_2/README.md b/docs/examples/move/ctf/challenge_2/README.md new file mode 100644 index 00000000000..68f5060fcdf --- /dev/null +++ b/docs/examples/move/ctf/challenge_2/README.md @@ -0,0 +1,3 @@ +# Challenge 2: Lucky Number + +This contract is used in the [second challenge](../../../../content/developer/iota-move-ctf/challenge_2.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_2/sources/counter.move b/docs/examples/move/ctf/challenge_2/sources/counter.move new file mode 100644 index 00000000000..9b20c1a1a1c --- /dev/null +++ b/docs/examples/move/ctf/challenge_2/sources/counter.move @@ -0,0 +1,45 @@ +module ctf::counter { + + const MaxCounter: u64 = 10; + const ENoAttemptLeft: u64 = 0; + + /// A shared counter. + public struct Counter has key { + id: UID, + owner: address, + value: u64 + } + + /// Create and share a Counter object. + public(package) fun create_counter(ctx: &mut TxContext) { + transfer::share_object(Counter { + id: object::new(ctx), + owner: tx_context::sender(ctx), + value: 0 + }) + } + + public fun owner(counter: &Counter): address { + counter.owner + } + + public fun value(counter: &Counter): u64 { + counter.value + } + + /// Increment a counter by 1. + public fun increment(counter: &mut Counter) { + counter.value = counter.value + 1; + } + + /// Set value (only runnable by the Counter owner) + public entry fun set_value(counter: &mut Counter, value: u64, ctx: &TxContext) { + assert!(counter.owner == tx_context::sender(ctx), 0); + counter.value = value; + } + + /// Check whether the counter has reached the limit. + public fun is_within_limit(counter: &mut Counter) { + assert!(counter.value <= MaxCounter, ENoAttemptLeft); + } +} diff --git a/docs/examples/move/ctf/challenge_2/sources/luckynumber.move b/docs/examples/move/ctf/challenge_2/sources/luckynumber.move new file mode 100644 index 00000000000..b3ba9f733e9 --- /dev/null +++ b/docs/examples/move/ctf/challenge_2/sources/luckynumber.move @@ -0,0 +1,23 @@ +module ctf::luckynumber { + use ctf::counter::{Self, Counter}; + + fun init(ctx: &mut TxContext) { + counter::create_counter(ctx); + } + + public struct Flag has key, store { + id: UID, + user: address + } + + public entry fun get_flag(user_counter: &mut Counter, lucky_num: u64, ctx: &mut TxContext) { + counter::increment(user_counter); + counter::is_within_limit(user_counter); + + let _ = lucky_num; + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/challenge_3/Move.toml b/docs/examples/move/ctf/challenge_3/Move.toml new file mode 100644 index 00000000000..b83d9a7f95b --- /dev/null +++ b/docs/examples/move/ctf/challenge_3/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "airdrop" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_3/README.md b/docs/examples/move/ctf/challenge_3/README.md new file mode 100644 index 00000000000..6ac7f3610f5 --- /dev/null +++ b/docs/examples/move/ctf/challenge_3/README.md @@ -0,0 +1,3 @@ +# Challenge 3: Degen logic + +This contract is used in the [third challenge](../../../../content/developer/iota-move-ctf/challenge_3.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_3/sources/counter.move b/docs/examples/move/ctf/challenge_3/sources/counter.move new file mode 100644 index 00000000000..9b20c1a1a1c --- /dev/null +++ b/docs/examples/move/ctf/challenge_3/sources/counter.move @@ -0,0 +1,45 @@ +module ctf::counter { + + const MaxCounter: u64 = 10; + const ENoAttemptLeft: u64 = 0; + + /// A shared counter. + public struct Counter has key { + id: UID, + owner: address, + value: u64 + } + + /// Create and share a Counter object. + public(package) fun create_counter(ctx: &mut TxContext) { + transfer::share_object(Counter { + id: object::new(ctx), + owner: tx_context::sender(ctx), + value: 0 + }) + } + + public fun owner(counter: &Counter): address { + counter.owner + } + + public fun value(counter: &Counter): u64 { + counter.value + } + + /// Increment a counter by 1. + public fun increment(counter: &mut Counter) { + counter.value = counter.value + 1; + } + + /// Set value (only runnable by the Counter owner) + public entry fun set_value(counter: &mut Counter, value: u64, ctx: &TxContext) { + assert!(counter.owner == tx_context::sender(ctx), 0); + counter.value = value; + } + + /// Check whether the counter has reached the limit. + public fun is_within_limit(counter: &mut Counter) { + assert!(counter.value <= MaxCounter, ENoAttemptLeft); + } +} diff --git a/docs/examples/move/ctf/challenge_3/sources/mint.move b/docs/examples/move/ctf/challenge_3/sources/mint.move new file mode 100644 index 00000000000..f3ed5916f1e --- /dev/null +++ b/docs/examples/move/ctf/challenge_3/sources/mint.move @@ -0,0 +1,39 @@ +module ctf::mintcoin { + use iota::coin::{Self, Coin, TreasuryCap}; + use ctf::counter::{Self, Counter}; + + + public struct MINTCOIN has drop {} + public struct Flag has key, store { + id: UID, + user: address + } + + #[allow(lint(share_owned))] + fun init(witness: MINTCOIN, ctx: &mut TxContext) { + counter::create_counter(ctx); + let (coincap, coindata) = coin::create_currency(witness, 0, b"MintCoin", b"Mint Coin", b"A coin that anyone can mint, mind blowing!", option::none(), ctx); + transfer::public_freeze_object(coindata); + transfer::public_share_object(coincap); + } + + public entry fun mint_coin(cap: &mut TreasuryCap, ctx: &mut TxContext) { + coin::mint_and_transfer(cap, 2, tx_context::sender(ctx), ctx); + } + + public entry fun burn_coin(cap: &mut TreasuryCap, coins: Coin) { + coin::burn(cap, coins); + } + + public entry fun get_flag(user_counter: &mut Counter, coins: &mut Coin, ctx: &mut TxContext) { + counter::increment(user_counter); + counter::is_within_limit(user_counter); + + let limit = coin::value(coins); + assert!(limit == 5, 1); + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/challenge_4/Move.toml b/docs/examples/move/ctf/challenge_4/Move.toml new file mode 100644 index 00000000000..b83d9a7f95b --- /dev/null +++ b/docs/examples/move/ctf/challenge_4/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "airdrop" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_4/README.md b/docs/examples/move/ctf/challenge_4/README.md new file mode 100644 index 00000000000..62c65cbae8d --- /dev/null +++ b/docs/examples/move/ctf/challenge_4/README.md @@ -0,0 +1,3 @@ +# Challenge 4: Airdrop + +This contract is used in the [fourth challenge](../../../../content/developer/iota-move-ctf/challenge_4.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_4/sources/airdrop.move b/docs/examples/move/ctf/challenge_4/sources/airdrop.move new file mode 100644 index 00000000000..ac57be4294c --- /dev/null +++ b/docs/examples/move/ctf/challenge_4/sources/airdrop.move @@ -0,0 +1,67 @@ +module ctf::airdrop { + use iota::table::{Self, Table}; + use iota::coin::{Self, Coin}; + use iota::balance::{Self, Balance}; + use ctf::counter::{Self, Counter}; + + + public struct AirdroppedTo has store { + user: address, + } + + public struct Vault has key { + id: UID, + balance: Balance, + userlist: Table, + } + + public struct AIRDROP has drop {} + + public struct Flag has key, store { + id: UID, + user: address + } + + fun init (witness: AIRDROP, ctx: &mut TxContext) { + counter::create_counter(ctx); + + let initializer = tx_context::sender(ctx); + let (mut coincap, coindata) = coin::create_currency(witness, 0, b"HORSE", b"Horse Tokens", b"To The Moon", option::none(), ctx); + let coins_minted = coin::mint(&mut coincap, 10, ctx); + transfer::public_freeze_object(coindata); + transfer::public_transfer(coincap, initializer); + transfer::share_object( + Vault { + id: object::new(ctx), + balance: coin::into_balance(coins_minted), + userlist: table::new(ctx), + } + ); + } + + public entry fun airdrop(vault: &mut Vault, ctx: &mut TxContext) { + let sender = tx_context::sender(ctx); + assert!(!table::contains(&vault.userlist, sender) ,1); + let mut balance_drop = balance::split(&mut vault.balance, 1); + let coin_drop = coin::take(&mut balance_drop, 1, ctx); + transfer::public_transfer(coin_drop, sender); + balance::destroy_zero(balance_drop); + table::add(&mut vault.userlist, sender, AirdroppedTo { + user: sender, + }); + } + + public entry fun get_flag(user_counter: &mut Counter, coin_drop: &mut Coin, ctx: &mut TxContext) { + + counter::increment(user_counter); + counter::is_within_limit(user_counter); + + let expected_value = coin::value(coin_drop); + assert!(expected_value == 2, 2); + + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/challenge_4/sources/counter.move b/docs/examples/move/ctf/challenge_4/sources/counter.move new file mode 100644 index 00000000000..9b20c1a1a1c --- /dev/null +++ b/docs/examples/move/ctf/challenge_4/sources/counter.move @@ -0,0 +1,45 @@ +module ctf::counter { + + const MaxCounter: u64 = 10; + const ENoAttemptLeft: u64 = 0; + + /// A shared counter. + public struct Counter has key { + id: UID, + owner: address, + value: u64 + } + + /// Create and share a Counter object. + public(package) fun create_counter(ctx: &mut TxContext) { + transfer::share_object(Counter { + id: object::new(ctx), + owner: tx_context::sender(ctx), + value: 0 + }) + } + + public fun owner(counter: &Counter): address { + counter.owner + } + + public fun value(counter: &Counter): u64 { + counter.value + } + + /// Increment a counter by 1. + public fun increment(counter: &mut Counter) { + counter.value = counter.value + 1; + } + + /// Set value (only runnable by the Counter owner) + public entry fun set_value(counter: &mut Counter, value: u64, ctx: &TxContext) { + assert!(counter.owner == tx_context::sender(ctx), 0); + counter.value = value; + } + + /// Check whether the counter has reached the limit. + public fun is_within_limit(counter: &mut Counter) { + assert!(counter.value <= MaxCounter, ENoAttemptLeft); + } +} diff --git a/docs/examples/move/ctf/challenge_5/Move.toml b/docs/examples/move/ctf/challenge_5/Move.toml new file mode 100644 index 00000000000..b933c266460 --- /dev/null +++ b/docs/examples/move/ctf/challenge_5/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "pizza" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_5/README.md b/docs/examples/move/ctf/challenge_5/README.md new file mode 100644 index 00000000000..2b85010acc4 --- /dev/null +++ b/docs/examples/move/ctf/challenge_5/README.md @@ -0,0 +1,3 @@ +# Challenge 5: Pizza! + +This contract is used in the [fifth challenge](../../../../content/developer/iota-move-ctf/challenge_5.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_5/package.json b/docs/examples/move/ctf/challenge_5/package.json new file mode 100644 index 00000000000..c5285ad251e --- /dev/null +++ b/docs/examples/move/ctf/challenge_5/package.json @@ -0,0 +1,8 @@ +{ + "devDependencies": { + "typescript": "^5.4.3" + }, + "dependencies": { + "@mysten/bcs": "^0.11.1" + } +} diff --git a/docs/examples/move/ctf/challenge_5/sources/pizza.move b/docs/examples/move/ctf/challenge_5/sources/pizza.move new file mode 100644 index 00000000000..4389b1ff7e6 --- /dev/null +++ b/docs/examples/move/ctf/challenge_5/sources/pizza.move @@ -0,0 +1,54 @@ +module ctf::pizza { + use std::bcs; + + public struct Pizza has store { + olive_oils: u16, + yeast: u16, + flour: u16, + water: u16, + salt: u16, + tomato_sauce: u16, + cheese: u16, + pineapple: u16, + } + + public struct PizzaBox has key, store { + id: UID, + pizza: Pizza, + } + + public struct Flag has key, store { + id: UID, + user: address + } + + const EMamaMiaNonBene: u64 = 0; + + #[allow(lint(self_transfer))] + public fun cook(olive_oils: u16, yeast: u16, flour: u16, water: u16, salt: u16, tomato_sauce: u16, cheese: u16, pineapple: u16, ctx: &mut tx_context::TxContext) { + let sender = tx_context::sender(ctx); + + let p = Pizza { + olive_oils, + yeast, + flour, + water, + salt, + tomato_sauce, + cheese, + pineapple, + }; + + transfer::public_transfer(PizzaBox { id: object::new(ctx), pizza: p }, sender); + } + + #[allow(lint(self_transfer))] + public fun get_flag(pizzabox: &PizzaBox, ctx: &mut tx_context::TxContext) { + // This is where the Pizzaiolo comes in to judge... + assert!(bcs::to_bytes(&pizzabox.pizza) == x"0a000300620272011200c800b4000000", EMamaMiaNonBene); + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/challenge_6/Move.toml b/docs/examples/move/ctf/challenge_6/Move.toml new file mode 100644 index 00000000000..100c3caa15c --- /dev/null +++ b/docs/examples/move/ctf/challenge_6/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "recycle" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_6/README.md b/docs/examples/move/ctf/challenge_6/README.md new file mode 100644 index 00000000000..7e65c0cd219 --- /dev/null +++ b/docs/examples/move/ctf/challenge_6/README.md @@ -0,0 +1,3 @@ +# Challenge 6: Go Recycle! + +This contract is used in the [sixth challenge](../../../../content/developer/iota-move-ctf/challenge_6.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_6/sources/pizza.move b/docs/examples/move/ctf/challenge_6/sources/pizza.move new file mode 100644 index 00000000000..ca0aa0ba6c7 --- /dev/null +++ b/docs/examples/move/ctf/challenge_6/sources/pizza.move @@ -0,0 +1,50 @@ +module ctf::pizza { + + public struct Pizza has key, store { + id: UID, + olive_oils: u16, + yeast: u16, + flour: u16, + water: u16, + salt: u16, + tomato_sauce: u16, + cheese: u16, + pineapple: u16, + } + + public struct PizzaBox has key, store { + id: UID, + pizza: Pizza, + } + + #[allow(lint(self_transfer))] + public fun cook(olive_oils: u16, yeast: u16, flour: u16, water: u16, salt: u16, tomato_sauce: u16, cheese: u16, pineapple: u16, ctx: &mut tx_context::TxContext) { + let sender = tx_context::sender(ctx); + + let p = Pizza { + id: object::new(ctx), + olive_oils, + yeast, + flour, + water, + salt, + tomato_sauce, + cheese, + pineapple, + }; + + transfer::public_transfer(PizzaBox { id: object::new(ctx), pizza: p }, sender); + } + + public fun has_pineapple_traces(box: &PizzaBox):bool { + box.pizza.pineapple > 0 + } + + public fun recycle_box(box: PizzaBox) { + let PizzaBox {id, pizza} = box; + let Pizza {id: pid, olive_oils: _, yeast: _, flour: _, water: _, salt: _, tomato_sauce: _, cheese: _, pineapple: _} = pizza; + + object::delete(pid); + object::delete(id); + } +} diff --git a/docs/examples/move/ctf/challenge_6/sources/recycle.move b/docs/examples/move/ctf/challenge_6/sources/recycle.move new file mode 100644 index 00000000000..25a5c635ba4 --- /dev/null +++ b/docs/examples/move/ctf/challenge_6/sources/recycle.move @@ -0,0 +1,59 @@ +module ctf::recycle { + use iota::transfer::{Receiving}; + use iota::dynamic_field as df; + use ctf::pizza::{Self, PizzaBox}; + + const ENoPizzaBoxProvidedEver: u64 = 1; + const ENotEnoughRecycledYet: u64 = 2; + const ENoRecyclingNeededJustEatIt: u64 = 3; + + public struct PizzaBoxRecycler has key { + id: object::UID + } + + public struct PizzaPointBalance has store { + amount: u64 + } + + public struct Flag has key, store { + id: UID, + user: address + } + + fun init (ctx: &mut TxContext) { + transfer::share_object( + PizzaBoxRecycler { + id: object::new(ctx) + } + ); + } + + public fun accept_box(recycler: &mut PizzaBoxRecycler, disposed: Receiving, ctx: &mut TxContext) { + let sender = tx_context::sender(ctx); + let box = transfer::public_receive(&mut recycler.id, disposed); + + assert!(pizza::has_pineapple_traces(&box), ENoRecyclingNeededJustEatIt); + + if (df::exists_(&recycler.id, sender)) { + let balance: &mut PizzaPointBalance = df::borrow_mut(&mut recycler.id, sender); + balance.amount = balance.amount + 1 + } else { + df::add(&mut recycler.id, sender, PizzaPointBalance { amount: 1 }); + }; + + pizza::recycle_box(box); + } + + #[allow(lint(self_transfer))] + public fun get_flag(recycler: &mut PizzaBoxRecycler, ctx: &mut TxContext) { + let sender = tx_context::sender(ctx); + // Make sure what we are withdrawing exists + assert!(df::exists_(&recycler.id, sender), ENoPizzaBoxProvidedEver); + let balance: &mut PizzaPointBalance = df::borrow_mut(&mut recycler.id, sender); + assert!(balance.amount > 2, ENotEnoughRecycledYet); + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/challenge_7/Move.toml b/docs/examples/move/ctf/challenge_7/Move.toml new file mode 100644 index 00000000000..85662b8f0b1 --- /dev/null +++ b/docs/examples/move/ctf/challenge_7/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "ptb" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_7/README.md b/docs/examples/move/ctf/challenge_7/README.md new file mode 100644 index 00000000000..809a932a650 --- /dev/null +++ b/docs/examples/move/ctf/challenge_7/README.md @@ -0,0 +1,3 @@ +# Challenge 7: PTBs + +This contract is used in the [seventh challenge](../../../../content/developer/iota-move-ctf/challenge_7.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_7/package.json b/docs/examples/move/ctf/challenge_7/package.json new file mode 100644 index 00000000000..73e4e60ded2 --- /dev/null +++ b/docs/examples/move/ctf/challenge_7/package.json @@ -0,0 +1,8 @@ +{ + "dependencies": { + "typescript": "^5.4.3" + }, + "devDependencies": { + "@mysten/sui.js": "^0.51.2" + } +} diff --git a/docs/examples/move/ctf/challenge_7/sources/ptb.move b/docs/examples/move/ctf/challenge_7/sources/ptb.move new file mode 100644 index 00000000000..33de9196dc7 --- /dev/null +++ b/docs/examples/move/ctf/challenge_7/sources/ptb.move @@ -0,0 +1,29 @@ +module ctf::ptb { + + public struct Flour has copy, drop {} + public struct Water has copy, drop {} + public struct Yeast has copy, drop {} + public struct Salt has copy, drop {} + public struct Dough has copy, drop {} + + public struct Flag has key, store { + id: UID, + user: address + } + + public fun get_ingredients(): (Flour, Water, Yeast, Salt) { + (Flour{}, Water{}, Yeast{}, Salt{}) + } + + public fun make_dough(_: Flour, _: Water, _: Yeast, _: Salt): Dough { + Dough{} + } + + #[allow(lint(self_transfer))] + public fun get_flag(_: Dough, ctx: &mut TxContext) { + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/challenge_8/Move.toml b/docs/examples/move/ctf/challenge_8/Move.toml new file mode 100644 index 00000000000..8fd521d7ec5 --- /dev/null +++ b/docs/examples/move/ctf/challenge_8/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "swap" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/challenge_8/README.md b/docs/examples/move/ctf/challenge_8/README.md new file mode 100644 index 00000000000..84fa57b3bee --- /dev/null +++ b/docs/examples/move/ctf/challenge_8/README.md @@ -0,0 +1,3 @@ +# Challenge 8: Flash! + +This contract is used in the [eighth challenge](../../../../content/developer/iota-move-ctf/challenge_8.mdx) of the IOTA Move CTF. diff --git a/docs/examples/move/ctf/challenge_8/sources/firstcoin.move b/docs/examples/move/ctf/challenge_8/sources/firstcoin.move new file mode 100644 index 00000000000..b00fddec985 --- /dev/null +++ b/docs/examples/move/ctf/challenge_8/sources/firstcoin.move @@ -0,0 +1,34 @@ +module ctf::ctfa { + use iota::coin::{Self, Coin, TreasuryCap}; + + public struct CTFA has drop {} + + public struct MintA has key, store { + id: UID, + cap: TreasuryCap + } + + fun init(witness: CTFA, ctx: &mut TxContext) { + // Get a treasury cap for the coin and give it to the transaction sender + let (treasury_cap, metadata) = coin::create_currency(witness, 1, b"CTFA", b"CTF A Coin", b"Token for the CTF", option::none(), ctx); + let mint = MintA { + id: object::new(ctx), + cap:treasury_cap + }; + transfer::share_object(mint); + transfer::public_freeze_object(metadata); + } + + public(package) fun mint_for_vault(mut mint: MintA, ctx: &mut TxContext): Coin { + let coina = coin::mint(&mut mint.cap, 100, ctx); + coin::mint_and_transfer(&mut mint.cap, 10, tx_context::sender(ctx), ctx); + let MintA { + id: ida, + cap: capa + } = mint; + object::delete(ida); + transfer::public_freeze_object(capa); + coina + } + +} diff --git a/docs/examples/move/ctf/challenge_8/sources/secondcoin.move b/docs/examples/move/ctf/challenge_8/sources/secondcoin.move new file mode 100644 index 00000000000..52434344fde --- /dev/null +++ b/docs/examples/move/ctf/challenge_8/sources/secondcoin.move @@ -0,0 +1,34 @@ +module ctf::ctfb { + use iota::coin::{Self, Coin, TreasuryCap}; + + public struct CTFB has drop {} + + public struct MintB has key, store { + id: UID, + cap: TreasuryCap + } + + fun init(witness: CTFB, ctx: &mut TxContext) { + // Get a treasury cap for the coin and give it to the transaction sender + let (treasury_cap, metadata) = coin::create_currency(witness, 1, b"CTFB", b"CTF B Coin", b"Token for the CTF", option::none(), ctx); + let mint = MintB { + id: object::new(ctx), + cap:treasury_cap + }; + transfer::share_object(mint); + transfer::public_freeze_object(metadata); + } + + public(package) fun mint_for_vault(mut mint: MintB, ctx: &mut TxContext): Coin { + let coinb = coin::mint(&mut mint.cap, 100, ctx); + coin::mint_and_transfer(&mut mint.cap, 10, tx_context::sender(ctx), ctx); + let MintB { + id: ida, + cap: capa + } = mint; + object::delete(ida); + transfer::public_freeze_object(capa); + coinb + } + +} diff --git a/docs/examples/move/ctf/challenge_8/sources/vault.move b/docs/examples/move/ctf/challenge_8/sources/vault.move new file mode 100644 index 00000000000..392bb0b73e9 --- /dev/null +++ b/docs/examples/move/ctf/challenge_8/sources/vault.move @@ -0,0 +1,93 @@ +module ctf::vault{ + use iota::coin::{Self, Coin}; + use iota::balance::{Self, Balance}; + use ctf::ctfa::{Self, MintA}; + use ctf::ctfb::{Self, MintB}; + + public struct Vault has key { + id: UID, + coin_a: Balance, + coin_b: Balance, + flashed: bool + } + + public struct Flag has key, store { + id: UID, + user: address + } + + public struct Receipt { + id: ID, + a_to_b: bool, + repay_amount: u64 + } + + public entry fun initialize(capa: MintA, capb: MintB,ctx: &mut TxContext) { + let vault = Vault { + id: object::new(ctx), + coin_a: coin::into_balance(ctfa::mint_for_vault(capa, ctx)), + coin_b: coin::into_balance(ctfb::mint_for_vault(capb, ctx)), + flashed: false + }; + transfer::share_object(vault); + } + + public fun flash(vault: &mut Vault, amount: u64, a_to_b: bool, ctx: &mut TxContext): (Coin, Coin, Receipt) { + assert!(!vault.flashed, 1); + let (coin_a, coin_b) = if (a_to_b) { + (coin::zero(ctx), coin::from_balance(balance::split(&mut vault.coin_b, amount ), ctx)) + } + else { + (coin::from_balance(balance::split(&mut vault.coin_a, amount ), ctx), coin::zero(ctx)) + }; + + let receipt = Receipt { + id: object::id(vault), + a_to_b, + repay_amount: amount + }; + vault.flashed = true; + + (coin_a, coin_b, receipt) + + } + + public fun repay_flash(vault: &mut Vault, coina: Coin, coinb: Coin, receipt: Receipt) { + let Receipt { + id: _, + a_to_b: a2b, + repay_amount: amount + } = receipt; + if (a2b) { + assert!(coin::value(&coinb) >= amount, 0); + } else { + assert!(coin::value(&coina) >= amount, 1); + }; + balance::join(&mut vault.coin_a, coin::into_balance(coina)); + balance::join(&mut vault.coin_b, coin::into_balance(coinb)); + vault.flashed = false; + } + + public fun swap_a_to_b(vault: &mut Vault, coina:Coin, ctx: &mut TxContext): Coin { + let amount_out_B = coin::value(&coina) * balance::value(&vault.coin_b) / balance::value(&vault.coin_a); + coin::put(&mut vault.coin_a, coina); + coin::take(&mut vault.coin_b, amount_out_B, ctx) + } + + public fun swap_b_to_a(vault: &mut Vault, coinb:Coin, ctx: &mut TxContext): Coin { + let amount_out_A = coin::value(&coinb) * balance::value(&vault.coin_a) / balance::value(&vault.coin_b); + coin::put(&mut vault.coin_b, coinb); + coin::take(&mut vault.coin_a, amount_out_A, ctx) + } + + #[allow(lint(self_transfer))] + public fun get_flag(vault: &Vault, ctx: &mut TxContext) { + assert!( + balance::value(&vault.coin_a) == 0 && balance::value(&vault.coin_b) == 0, 123 + ); + transfer::public_transfer(Flag { + id: object::new(ctx), + user: tx_context::sender(ctx) + }, tx_context::sender(ctx)); + } +} diff --git a/docs/examples/move/ctf/deploy.py b/docs/examples/move/ctf/deploy.py new file mode 100644 index 00000000000..33cebb9835f --- /dev/null +++ b/docs/examples/move/ctf/deploy.py @@ -0,0 +1,110 @@ +import os +import glob +import subprocess +import sys +import json +import time +from pprint import pp + +def execute_in_directories(executable_path, base_directory): + # Check if the executable exists + base_directory = os.path.abspath(base_directory) + + if not os.path.isfile(executable_path): + print(f"Executable not found: {executable_path}") + sys.exit(1) + + to_whitelist = [] + package = None + cap = None + challenges = None + + # Iterate over all directories in the base_directory + for folder in sorted(glob.glob(os.path.join(base_directory, '*'))): + if os.path.isdir(folder) and 'challenge_' in folder: + print(folder.rsplit('/', 1)[1]) + try: + # Change to the current directory + os.chdir(folder) + # Execute the command + data = subprocess.run([executable_path, 'client', 'publish', '--json', '--gas-budget=100000000', '--skip-dependency-verification'], check=False, capture_output=True, text=True) + #print(data.stdout) + data.check_returncode() + deployed = json.loads(data.stdout) + for oc in deployed['objectChanges']: + if oc['type'] == 'published': + pid = oc['packageId'] + modules = oc['modules'] + print(f"Package: {pid}") + + for module in modules: + to_whitelist.append('%s::%s::Flag' % (pid, module)) + + elif oc['type'] == 'created': + otype = oc['objectType'].split('::', 2)[2] + oid = oc['objectId'] + print(f"{otype}: {oid}") + + except subprocess.CalledProcessError as e: + print(f"Error executing in {folder}: {e}") + except Exception as e: + print(f"An unexpected error occurred in {folder}: {e}") + finally: + # Change back to the base directory + os.chdir(base_directory) + time.sleep(5) + + elif os.path.isdir(folder) and 'verifier' in folder: + try: + # Change to the current directory + os.chdir(folder) + # Execute the command + data = subprocess.run([executable_path, 'client', 'publish', '--json', '--gas-budget=100000000', '--skip-dependency-verification'], check=True, capture_output=True, text=True) + deployed = json.loads(data.stdout) + for oc in deployed['objectChanges']: + if oc['type'] == 'published': + package = oc['packageId'] + elif oc['type'] == 'created': + if oc['objectType'].endswith('CTFCap'): + cap = oc['objectId'] + if oc['objectType'].endswith('Challenges'): + challenges = oc['objectId'] + + except subprocess.CalledProcessError as e: + print(f"Error executing in {folder}: {e}") + except Exception as e: + print(f"An unexpected error occurred in {folder}: {e}") + finally: + # Change back to the base directory + os.chdir(base_directory) + time.sleep(5) + + print("Done") + + + print("Adding allowed flags to the verifier contract, false positives will fail") + for module in to_whitelist: + try: + # iota client call --function allow_flag_type --module verifier --package $PACKAGE --args $CAP $SB --type-args 0xe6d41a7f9530acb58fae2318f33eb27f80f84406268a23043ab9289d318f3ddc::checkin::Flag --gas-budget 100000000 + subprocess.run([executable_path, 'client', 'call', '--function', 'allow_flag_type', '--module', 'verifier', '--package', package, '--args', cap, challenges, '--type-args', module, '--gas-budget', '100000000'], check=True, capture_output=True, text=True) + except Exception as e: + print(f"Failed to allow flag `{module}`, it probably does not exist (false positive)") + + print('All Done!\n') + print('-' * 80) + print('Package ID for Verifier: %s' % package) + print('CTFCap Object ID: %s' % cap) + print('Shared Challenges Object ID: %s' % challenges) + print('-' * 80) + + +if __name__ == "__main__": + if len(sys.argv) != 3: + print("Usage: python deploy.py ") + sys.exit(1) + + executable_path = sys.argv[1] + base_directory = sys.argv[2] + + execute_in_directories(executable_path, base_directory) + diff --git a/docs/examples/move/ctf/verifier/Move.toml b/docs/examples/move/ctf/verifier/Move.toml new file mode 100644 index 00000000000..bbd6fa578d1 --- /dev/null +++ b/docs/examples/move/ctf/verifier/Move.toml @@ -0,0 +1,11 @@ +[package] +name = "verifier" +version = "0.0.1" +edition = "2024.beta" + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "v0.2.0" } + +[addresses] +ctf = "0x0" +iota = "0000000000000000000000000000000000000000000000000000000000000002" diff --git a/docs/examples/move/ctf/verifier/README.md b/docs/examples/move/ctf/verifier/README.md new file mode 100644 index 00000000000..cf6818488e6 --- /dev/null +++ b/docs/examples/move/ctf/verifier/README.md @@ -0,0 +1,3 @@ +# CTF Verifier, track participants! + +This solver accepts flags and counts the amount of valid flags per participant, can be used to figure out who the winner is diff --git a/docs/examples/move/ctf/verifier/sources/verifier.move b/docs/examples/move/ctf/verifier/sources/verifier.move new file mode 100644 index 00000000000..a40908766ce --- /dev/null +++ b/docs/examples/move/ctf/verifier/sources/verifier.move @@ -0,0 +1,134 @@ +module ctf::verifier { + + use std::ascii::{String}; + use std::type_name::{get, into_string}; + use iota::table::{Self, Table}; + use iota::clock::{Self, Clock}; + use iota::address; + use iota::event; + + public struct CapturedFlag has store { + flag_type: String, + capture_time: u64 + } + + public struct Score has store { + captured_flags: u64, + latest_capture: u64 + } + + public struct ScoreBoard has copy, drop { + scores: vector + } + + public struct ScoreBoardElement has copy, drop { + sender: address, + captured_flags: u64, + latest_capture: u64 + } + + public struct Challenges has key { + id: UID, + /// The type name of the flags that are allowed to be submitted + allowed_flags: vector, + captured_flags: Table>, + participants: vector
, + scores: Table + } + + public struct CTFCap has key, store { + id: UID + } + + const EFlagNotAllowed: u64 = 0; + const EFlagAlreadySubmitted: u64 = 1; + + fun init (ctx: &mut TxContext) { + transfer::public_transfer( + CTFCap { + id: object::new(ctx) + }, tx_context::sender(ctx) + ); + + transfer::share_object( + Challenges { + id: object::new(ctx), + allowed_flags: vector::empty(), + captured_flags: table::new>(ctx), + participants: vector::empty
(), + scores: table::new(ctx) + } + ); + } + + /// Admin functionality to enable a new flag type to be submitted + public fun allow_flag_type(_cap: &CTFCap, challenges: &mut Challenges) { + let flag_type_string = get().into_string(); + challenges.allowed_flags.push_back(flag_type_string); + } + + /// Capture function to call after sending the flag here! + public fun capture(challenges: &mut Challenges, captured_flag: T, clock: &Clock, ctx: &mut TxContext) { + let sender = tx_context::sender(ctx); + + let tname = get().into_string(); + + // Check if this flag is allowed to be submitted + assert!(vector::contains(&challenges.allowed_flags, &tname), EFlagNotAllowed); + + let cflag = CapturedFlag { flag_type: tname, capture_time: clock::timestamp_ms(clock)}; + + // Add the empty vector for non-existing flags + if(!table::contains(&challenges.captured_flags, sender)) { + table::add(&mut challenges.captured_flags, sender, vector::empty()); + }; + + // Initialize a scoreboard object for this sender if not there yet + if(!table::contains(&challenges.scores, sender)) { + table::add(&mut challenges.scores, sender, Score { captured_flags: 0, latest_capture: 0}); + challenges.participants.push_back(sender); + }; + + // Check if flag was already captured + let mut i = 0; + let submitted = table::borrow(&challenges.captured_flags, sender); + + while(i < submitted.length()) { + let tmp_cflag = &submitted[i]; + assert!(tmp_cflag.flag_type != tname, EFlagAlreadySubmitted); + i = i + 1; + }; + + let captured_flags = table::borrow_mut(&mut challenges.captured_flags, sender); + captured_flags.push_back(cflag); + + let scoreboard = table::borrow_mut(&mut challenges.scores, sender); + scoreboard.captured_flags = scoreboard.captured_flags + 1; + scoreboard.latest_capture = clock::timestamp_ms(clock); + + // Burn the flag! + transfer::public_transfer(captured_flag, address::from_u256(1337)); + } + + /// Return the global scoreboard + public fun scoreboard(challenges: &Challenges): vector { + let mut i = 0; + let mut score_vector = vector::empty(); + + while(i < challenges.participants.length()) { + let addr = challenges.participants[i]; + let score = &challenges.scores[addr]; + score_vector.push_back(ScoreBoardElement { sender: addr, captured_flags: score.captured_flags, latest_capture: score.latest_capture }); + i = i + 1; + }; + + event::emit(ScoreBoard { scores: score_vector }); + score_vector + } + + /// Return the captures for a given address + public fun captured(challenges: &Challenges, addr: address): &vector { + table::borrow(&challenges.captured_flags, addr) + } + +} diff --git a/docs/site/src/components/CTF/ctf-verifier.tsx b/docs/site/src/components/CTF/ctf-verifier.tsx new file mode 100644 index 00000000000..cc25c579746 --- /dev/null +++ b/docs/site/src/components/CTF/ctf-verifier.tsx @@ -0,0 +1,94 @@ +import React, { useState, useMemo } from 'react'; +import { + IotaClientProvider, + WalletProvider, +} from '@iota/dapp-kit'; +import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +import { getFullnodeUrl, IotaClient } from '@iota/iota-sdk/client'; + +// Define props interface +interface ChallengeVerifierProps { + expectedObjectType: string; // Prop for the expected Object Type +} + +// Define network configurations +const NETWORKS = { + devnet: { url: getFullnodeUrl('devnet') }, + alphanet: { url: 'https://api.iota-rebased-alphanet.iota.cafe:443' }, +}; + +// Main ChallengeVerifier component +const ChallengeVerifier: React.FC = ({ expectedObjectType }) => { + const [inputText, setInputText] = useState(''); + const [coins, setCoins] = useState(null); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(''); + + const handleSubmit = async () => { + setLoading(true); + setError(''); + setCoins(null); + + try { + const client = new IotaClient({ url: NETWORKS.alphanet.url }); + const result = await client.getObject({ id: inputText, options: { showType: true } }); + + const message = result.data.type === expectedObjectType + ? 'Congratulations! You have successfully completed this level!' + : 'Invalid Flag Object Id. Please try again.'; + + setCoins(message); + } catch (err: any) { + setError(err.message || 'An error occurred. Please try again.'); + } finally { + setLoading(false); + } + }; + + return ( +
+ setInputText(e.target.value)} + placeholder="Enter Flag Object Id" + /> + + + {error &&

{error}

} + + {coins && ( +
+

Result

+ 
{JSON.stringify(coins, null, 2)}
+
+ )} +
+ ); +}; + +// Higher-order function to provide necessary context +const withProviders = (Component: React.FC) => { + return ({ expectedObjectType }: ChallengeVerifierProps) => { + if (typeof window === 'undefined') { + return null; + } + + const queryClient = useMemo(() => new QueryClient(), []); + + return ( + + + + + + + + ); + }; +}; + +// Export the component wrapped in providers +export default withProviders(ChallengeVerifier); From f1f6c498eb44e95212849308dec0be734c213ae4 Mon Sep 17 00:00:00 2001 From: miker83z Date: Tue, 22 Oct 2024 18:20:46 +0200 Subject: [PATCH 59/62] clean iota-framework clean iota-system clean stardust clean iota-framework 2 chore(iota-framework): remove deprecated code chore(iota-framework): remove deprecated kiosk allow_extensions fix(iota-framework-snapshot): update snapshot and manifest fix(iota-framework-snapshot): update manifest --- ...000000000000000000000000000000000000000002 | Bin 70495 -> 69952 bytes crates/iota-framework-snapshot/manifest.json | 2 +- .../sources/authenticator_state.move | 6 +- .../packages/iota-framework/sources/coin.move | 12 --- .../iota-framework/sources/coin_manager.move | 10 +-- .../iota-framework/sources/config.move | 9 +-- .../iota-framework/sources/display.move | 28 +++---- .../iota-framework/sources/kiosk/kiosk.move | 29 +------ .../iota-framework/sources/labeler.move | 2 + .../packages/iota-framework/sources/math.move | 43 ----------- .../packages/iota-framework/sources/pay.move | 6 -- .../iota-framework/sources/tx_context.move | 4 +- .../iota-framework/sources/vec_map.move | 4 +- .../iota-framework/sources/vec_set.move | 4 +- .../iota-framework/tests/address_tests.move | 2 +- .../iota-framework/tests/coin_tests.move | 2 +- .../tests/crypto/groth16_tests.move | 2 +- .../tests/crypto/poseidon_tests.move | 12 +-- .../iota-framework/tests/event_tests.move | 2 +- .../tests/kiosk/kiosk_tests.move | 31 -------- .../iota-framework/tests/math_tests.move | 73 ------------------ .../timelock/timelocked_balance_tests.move | 2 +- .../sources/timelocked_staking.move | 6 +- .../iota-system/sources/validator.move | 2 +- .../iota-system/sources/validator_set.move | 6 +- .../tests/timelocked_delegation_tests.move | 24 +++--- .../packages/stardust/sources/nft/irc27.move | 2 +- .../packages_compiled/iota-framework | Bin 70430 -> 69887 bytes crates/iota-framework/published_api.txt | 36 --------- 29 files changed, 66 insertions(+), 295 deletions(-) delete mode 100644 crates/iota-framework/packages/iota-framework/sources/math.move delete mode 100644 crates/iota-framework/packages/iota-framework/tests/math_tests.move diff --git a/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000002 b/crates/iota-framework-snapshot/bytecode_snapshot/1/0x0000000000000000000000000000000000000000000000000000000000000002 index 8222db7eec30f408dbb83375b9efbe46925c6b78..0bc77f041602ffa433bc631ff7f4c5e6fecf65de 100644 GIT binary patch delta 3112 zcmZ`*TWlOx8UD{@X3m^5yWUx^9eZuBcYWFQdhCs_>)G}Fmb;U*Y1*dEr3i`gK%{_5 zo1_xU122FChyf%Xs8W!Sc&O6G6(O;kRP+IXkPr{#@3z% zzw@2{K4;GP&;0SH^4%ZH@8ntatwQZ$*5S9ZXA;B^noTLLvIpEq31JKBf=K!1{H#p4&;&Jka z6PAs5!6A8?azMMQ5%(L+0W}Yw2%bz5Kirl=T=of%rAacDZby8fk)g?`M~d!_PR1d- zuM2Udo8)U*3X$od1chF*8HsVAFNb`vpKv%&@}U@u1(K8o2v-M5{`?T(*x}IW|uGq$GYp5x$T@ z32&>XfbW~n0qCu{?CY#)AT7Za{wxFmpK6Zp z`=m<5UILSIf0B2RO1A>?Sj7$Vr+7ChIt-iRndt1*R2wDSbLIX_^y<~#<^PpU^PW!+ zHp_cS;kL5idBL)oUybfvJ;;`#+^ZYg7hnCy^w~T4z5bt!`~P|I@_)E|BsQ#@@?XMv zLp^fTwbY9Je(JJ*;D6Taq?Pwx`dT9K=l)dkQNP{xVLyi{$UrybpdSh_3X6CXJOj^S zmRr{^G_u(FVIDX@mypqet9*&e(Jvb_Kk z**<{HY!2W+cRxT!zJQLM?f~LGcM$R95G9x$F5(4JDk41;a+C$dhjuZn&yO<-kX69&ed}bC0i8}6hvg7D+8aiiA&=4ES z!J}O?iS0crk8MRbJ>v|Va-qnSGY{k7ob4%sdJ0uaJslvr3oEPGqMs=Dg6TVmx1ia7 z0QcGA`sl*gNToJbuJ}5oC#I{_j2@q!tJSonmEJ!+S0AfPERI&@mY4KuZY5W$1eNi{ z$?D9J*=prjWoxQBU5!3?>o?nP-*~{bfAscs9)0HK>FC0H1JV08e-=f*m}*Eo?i)s9 zn_9Lel8kel52*y_q?l2ONtLJzJpD~7IV-D#MOKM`+40QbVoD`YurAbN>T=$cI@-lr zxdxCh;%V@4`8_-_1}gq?*q~F2of5ayNE(&(5G_%07{6)o+XM|!mgJ#GqZ^)EED%j6 zh7GiXXEV?7EW_HFCq0q0{COh_GG%43k7DmIb{wT3yRANwh!P(A&{+77Jt>s*F%tdi zRySLY{&eeW%!xjCdw}Wa>$kTM@86zc#YpcgBR{e;z)W;;r;p7?-`u&#)}jx0iYU+T zR2_~^^KFR_j2Z@c487&p4j?c6(cHiq3G#p5&2uoI;q6Cd-K zvkdRU2aCA~yLc|zy_04A(fvE6q%M)4;b|G>c|P*)4&`+TS4nffGcU7N4lgxFp;24Y zsK5)+$-6`2pJt@dNK+(*>mLdXD);~69D4&Jo)IuzaoisPk}J}A#5trx%I{Dr;2 z)OSVRz9F=?D}Ehq+?%S}7HtK`Mr4xKj#)l&kM0t#@yK9LbrfjVHP{mIMJi*N=*GR7 z=%4qNJiIeM{%VLO?tidiLcq->@#-aWjeE`TN{Gdx%ww!50k<%F zD*HGT`(&sNODEW->)}DbU1}K-`42PY$Ido7yXhpXx*rD^lD36k+NA_+y4%Me`t|<; Da)wb= delta 3565 zcmZ`+S!`Ta8UD|5?>%$Qo#oDq*YO_5WBYpFX2#>#GhVVZcDg3%8pkCriBxB`n+1tc zSyY|?=~Be5wnB&(h+4C>NtIIi00N~il%VoL1xSGMf`mXw2*m&28P^5MMETBt{_Xtd z+;hHj{G*rTZ@wiz-@$S(cNR7(ue7|_a@W`Z5M|KF8;^;z&kOlUIbdCvUy#mQ>ib&# zJz26}P4(*cQU}eq)7pI{{h|~7MJ5sZT_yqbkb+J)0LS2AcobGyk{x76*dxGP1`K$J zN|9_rS%xSCY8c20HCiHaOM$Q*5HSgs%fX2|pdt=L9ESmDluXnCI7(q~oMSxP2N($V zTQ=gFL;941BSAW%5l3h|n09eq@KB88d*TVil1I3bB+XzYnZoADGis9Uc||sKE$z59`ET#`Cf|_ro|VGv$i}A&-^H+V1*nO#7aY?Ss5hx0ZHksq00N-U)ZKo0u}rsSbg zg1PqGNE_qM{=PD(V&5pJBcpu~S@!1{=#!(pV5SlU{H!yDJ{anHr_@#)E#Dc|q&7yYEa&z&zb+Xxl`CYTW?NH7keU2UAI(b-W#)n-%Un6T#< z>hTaAWmr`kc16`DP|Z;cvgg~68>VY<$~YLO!+$2mluK^mc!ps{^`AzDR#CM|w1zI2 zpK7Q4!Pn0>RFq@LW|6C{lx1T%jFW^eH6smz8Zu!cYZ5;{YGK^O+j7LzBa18f~!QLx9=(~L7db*fb=o=?r+%;9-Abz!_ z36tba0gUYxapwqc0RziMdJDng)h<&sc0stfPcYeqt1YY;eD-R#QZO(DhUYzAhY3eb zKItuaC080iR+6-Zyis2N|4ez_@IjLZqXZ7ly)oWMCS6O&LlZa58|O`As530b)4{~G zL^$A1DEB6LbI^aSd5+51)lTrtho_t3Eo6w)#=#SVg)=V~eD~S`HW&Qu+M*^RN?@uS zY!^QE=kX_g(z$an#KMc=gm~sTA^#~BtvBVrg!6`aQK|P5CHn>M6HLF9TsP09l>52V zucOgFbtGf|=&<9@c5)bpI%tM==zuQpVHWR*N8nK$@zd8=D;c~KUK7Iu#k zmzR;tT__-%xo{l0+=U#T1Q+IA!qy1k!DtLIkBsiZvPbfLNz$*SFx7OL#Dx$~)YT&y zH#8z^Bd5DCOyVFy1%^n>HX%IGgia4OHDkhQ z8Dik{cV(G!W?%@M)s`%%V`x(9;Q_?RzA{nw1O2UF+77PZC22+u;0B!YX9xR-i-Z2K zrxSW?BA-j^;fca@QCnK+(TPHFXn1UPV7O2!>4osL0{&t5un?(C(Y{n_U2liz!u*QGD5Z?682 z`L91Xs+_Ger&c$%HiLV9_;cn2?yJR$)vsbpMkDoLQ_fMdS4BCOC`_v8n2Ht! z5=d2)ob{`yMPAVXW`{k8i*X{J=%P@&VubUm*3l81DAxcI`dkejemfVBp@AW57=; z?K84ddR85>v;$dVhj}_>v(-i#kwrF{HWvOzPRq-n{8}q32dl4rimBlDuXQmKI5$=h zkKPz#+2Aub=1~6W4cwQ(-5afJCWzeJU<<+Jn?0!i#?2wr+`icuTU<13TDUgWfT@GO z+}vbK!Rglro#~Jy_iumg^=Vd#X`+QjX;~4xGO0S8TimJ(d4(Z6BzVXq3>PV3rFZ#c0cV6p@^JSp=XyoJ@{cx8f(*(PT}{=3-lMf8}r^D{NYyr zBf6SIB&A{b4Bxv`t4#Brnw-P=5Ixd-ayTD)t%WjAbEGeU+koNjz>UZ8O0%_tn+Ybi zPrvbQwDLCJp;2TuTiE-pW#b&5S6^l&_g!`z@N%b1ny63`U@8E-_yBC$aE`$2$RYSV zLJ6r7*@L>AA~;2Ga^~dB@lh?f;7o!%b>^w3Qm4*5Q#f;KeRb{Zsnv_;wh*_@%Z;_o z(_&-oir6@FR-8X~SzfwuaWg`&x-~kMmjq&KY9e^^q4F`TK;oqFTj_BB*E%NL;I$4O zs9iUg)014{PVu6g2t5=Xtnd9y5x!lzecSfmvUgSnFL1?`7ReR48nZS&?%ZYHVd_hw z!+uq0_s8N+kbh@v#dJg0^4&7LNd>xFBZw{UqRc+I$={frBwR8H2KZKdxKamcmmTg(bZ`{3~zz-=dz7H2?qr diff --git a/crates/iota-framework-snapshot/manifest.json b/crates/iota-framework-snapshot/manifest.json index 5fc48001399..af63d8fe734 100644 --- a/crates/iota-framework-snapshot/manifest.json +++ b/crates/iota-framework-snapshot/manifest.json @@ -1,6 +1,6 @@ { "1": { - "git_revision": "79d2e3399d20", + "git_revision": "a85ff06d86c3", "package_ids": [ "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002", diff --git a/crates/iota-framework/packages/iota-framework/sources/authenticator_state.move b/crates/iota-framework/packages/iota-framework/sources/authenticator_state.move index d368ea29371..debe3bef2ea 100644 --- a/crates/iota-framework/packages/iota-framework/sources/authenticator_state.move +++ b/crates/iota-framework/packages/iota-framework/sources/authenticator_state.move @@ -82,9 +82,9 @@ module iota::authenticator_state { fun jwk_equal(a: &JWK, b: &JWK): bool { (&a.kty == &b.kty) && - (&a.e == &b.e) && - (&a.n == &b.n) && - (&a.alg == &b.alg) + (&a.e == &b.e) && + (&a.n == &b.n) && + (&a.alg == &b.alg) } fun jwk_id_equal(a: &JwkId, b: &JwkId): bool { diff --git a/crates/iota-framework/packages/iota-framework/sources/coin.move b/crates/iota-framework/packages/iota-framework/sources/coin.move index ae0d3118c12..a44e9a8e103 100644 --- a/crates/iota-framework/packages/iota-framework/sources/coin.move +++ b/crates/iota-framework/packages/iota-framework/sources/coin.move @@ -493,16 +493,4 @@ module iota::coin { } } - // === Deprecated code === - - // oops, wanted treasury: &TreasuryCap - public fun supply(treasury: &mut TreasuryCap): &Supply { - &treasury.total_supply - } - - // deprecated as we have CoinMetadata now - #[allow(unused_field)] - public struct CurrencyCreated has copy, drop { - decimals: u8 - } } diff --git a/crates/iota-framework/packages/iota-framework/sources/coin_manager.move b/crates/iota-framework/packages/iota-framework/sources/coin_manager.move index 384660541b5..faf184e92c8 100644 --- a/crates/iota-framework/packages/iota-framework/sources/coin_manager.move +++ b/crates/iota-framework/packages/iota-framework/sources/coin_manager.move @@ -361,11 +361,11 @@ module iota::coin_manager { /// Mint `amount` of `Coin` and send it to `recipient`. Invokes `mint()`. public fun mint_and_transfer( - _: &CoinManagerTreasuryCap, - manager: &mut CoinManager, - amount: u64, - recipient: address, - ctx: &mut TxContext + _: &CoinManagerTreasuryCap, + manager: &mut CoinManager, + amount: u64, + recipient: address, + ctx: &mut TxContext ) { assert!(total_supply(manager) + amount <= maximum_supply(manager), EMaximumSupplyReached); coin::mint_and_transfer(&mut manager.treasury_cap, amount, recipient, ctx) diff --git a/crates/iota-framework/packages/iota-framework/sources/config.move b/crates/iota-framework/packages/iota-framework/sources/config.move index 27d26b64392..68f632a3f73 100644 --- a/crates/iota-framework/packages/iota-framework/sources/config.move +++ b/crates/iota-framework/packages/iota-framework/sources/config.move @@ -263,9 +263,7 @@ module iota::config { ) } - /* - This is kept native to keep gas costing consistent. - */ + /* This is kept native to keep gas costing consistent. */ native fun read_setting_impl< FieldSettingValue: key, SettingValue: store, @@ -276,15 +274,12 @@ module iota::config { name: address, current_epoch: u64, ): Option; - /* - // but the code is essentially + /* but the code is essentially: if (!field::exists_with_type(&config.id, setting)) return option::none() let sobj: &Setting = field::borrow(&config.id, setting); let data = sobj.data.borrow(); if (current_epoch > data.newer_value_epoch) option::some(data.newer_value) else data.older_value_opt - - } */ } diff --git a/crates/iota-framework/packages/iota-framework/sources/display.move b/crates/iota-framework/packages/iota-framework/sources/display.move index 755fb89699f..bf6cc92765a 100644 --- a/crates/iota-framework/packages/iota-framework/sources/display.move +++ b/crates/iota-framework/packages/iota-framework/sources/display.move @@ -34,12 +34,12 @@ module iota::display { /// on the property values of an Object. /// ``` /// // Example of a display object - /// Display<0x...::capy::Capy> { + /// Display<0x107A::nft::Nft> { /// fields: - /// - /// - /// - /// + /// + /// + /// + /// /// } /// ``` /// @@ -200,26 +200,26 @@ module iota::display_tests { #[allow(unused_field)] /// An example object. /// Purely for visibility. - public struct Capy has key { + public struct IotestNft has key { id: UID, name: String } /// Test witness type to create a Publisher object. - public struct CAPY has drop {} + public struct IOTESTNFT has drop {} #[test] - fun capy_init() { + fun nft_test_init() { let mut test = test::begin(@0x2); - let pub = package::test_claim(CAPY {}, test.ctx()); + let pub = package::test_claim(IOTESTNFT {}, test.ctx()); // create a new display object - let mut display = display::new(&pub, test.ctx()); + let mut display = display::new(&pub, test.ctx()); - display.add(b"name".to_string(), b"Capy {name}".to_string()); - display.add(b"link".to_string(), b"https://capy.art/capy/{id}".to_string()); - display.add(b"image".to_string(), b"https://api.capy.art/capy/{id}/svg".to_string()); - display.add(b"description".to_string(), b"A Lovely Capy".to_string()); + display.add(b"name".to_string(), b"IOTEST Nft {name}".to_string()); + display.add(b"link".to_string(), b"https://iotestnft.com/nft/{id}".to_string()); + display.add(b"image".to_string(), b"https://api.iotestnft.com/nft/{id}/svg".to_string()); + display.add(b"description".to_string(), b"One of many Iotest Nfts".to_string()); pub.burn_publisher(); transfer::public_transfer(display, @0x2); diff --git a/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move b/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move index 89bae9ea51f..feb0db46b38 100644 --- a/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move +++ b/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move @@ -116,8 +116,7 @@ module iota::kiosk { const EWrongKiosk: u64 = 5; /// Trying to exclusively list an already listed item. const EAlreadyListed: u64 = 6; - /// Trying to call `uid_mut` when `allow_extensions` set to false. - const EUidAccessNotAllowed: u64 = 7; + /// 7 is reserved due to a previous interface having EUidAccessNotAllowed. /// Attempt to `take` an item that is locked. const EItemLocked: u64 = 8; /// Taking or mutably borrowing an item that is listed. @@ -143,12 +142,6 @@ module iota::kiosk { /// Number of items stored in a Kiosk. Used to allow unpacking /// an empty Kiosk if it was wrapped or has a single owner. item_count: u32, - /// [DEPRECATED] Please, don't use the `allow_extensions` and the matching - /// `set_allow_extensions` function - it is a legacy feature that is being - /// replaced by the `kiosk_extension` module and its Extensions API. - /// - /// Exposes `uid_mut` publicly when set to `true`, set to `false` by default. - allow_extensions: bool } /// A Capability granting the bearer a right to `place` and `take` items @@ -248,7 +241,6 @@ module iota::kiosk { profits: balance::zero(), owner: ctx.sender(), item_count: 0, - allow_extensions: false }; let cap = KioskOwnerCap { @@ -265,7 +257,7 @@ module iota::kiosk { public fun close_and_withdraw( self: Kiosk, cap: KioskOwnerCap, ctx: &mut TxContext ): Coin { - let Kiosk { id, profits, owner: _, item_count, allow_extensions: _ } = self; + let Kiosk { id, profits, owner: _, item_count } = self; let KioskOwnerCap { id: cap_id, `for` } = cap; assert!(id.to_inner() == `for`, ENotOwner); @@ -532,16 +524,6 @@ module iota::kiosk { &mut self.id } - /// [DEPRECATED] - /// Allow or disallow `uid` and `uid_mut` access via the `allow_extensions` - /// setting. - public fun set_allow_extensions( - self: &mut Kiosk, cap: &KioskOwnerCap, allow_extensions: bool - ) { - assert!(self.has_access(cap), ENotOwner); - self.allow_extensions = allow_extensions; - } - /// Get the immutable `UID` for dynamic field access. /// Always enabled. /// @@ -551,13 +533,6 @@ module iota::kiosk { &self.id } - /// Get the mutable `UID` for dynamic field access and extensions. - /// Aborts if `allow_extensions` set to `false`. - public fun uid_mut(self: &mut Kiosk): &mut UID { - assert!(self.allow_extensions, EUidAccessNotAllowed); - &mut self.id - } - /// Get the owner of the Kiosk. public fun owner(self: &Kiosk): address { self.owner diff --git a/crates/iota-framework/packages/iota-framework/sources/labeler.move b/crates/iota-framework/packages/iota-framework/sources/labeler.move index bf9317456dc..5a68219f8a2 100644 --- a/crates/iota-framework/packages/iota-framework/sources/labeler.move +++ b/crates/iota-framework/packages/iota-framework/sources/labeler.move @@ -1,6 +1,8 @@ // Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 +/// Defines a LabelerCap used for creating labels in a ``iota::timelock::Timelock`` object. +/// The LabelerCap can be created only be consuming an OTW, making then labels unique for each cap. module iota::labeler { /// Error code for when a type passed to the `create_labeler_cap` function is not a one-time witness. diff --git a/crates/iota-framework/packages/iota-framework/sources/math.move b/crates/iota-framework/packages/iota-framework/sources/math.move deleted file mode 100644 index a164fe39cbf..00000000000 --- a/crates/iota-framework/packages/iota-framework/sources/math.move +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -/// DEPRECATED, use the each integer type's individual module instead, e.g. `std::u64` -#[deprecated(note = b"Use the each integer type's individual module instead, e.g. `std::u64`")] -module iota::math { - - /// DEPRECATED, use `std::u64::max` instead - public fun max(x: u64, y: u64): u64 { - x.max(y) - } - - /// DEPRECATED, use `std::u64::min` instead - public fun min(x: u64, y: u64): u64 { - x.min(y) - } - - /// DEPRECATED, use `std::u64::diff` instead - public fun diff(x: u64, y: u64): u64 { - x.diff(y) - } - - /// DEPRECATED, use `std::u64::pow` instead - public fun pow(base: u64, exponent: u8): u64 { - base.pow(exponent) - } - - /// DEPRECATED, use `std::u64::sqrt` instead - public fun sqrt(x: u64): u64 { - x.sqrt() - } - - /// DEPRECATED, use `std::u128::sqrt` instead - public fun sqrt_u128(x: u128): u128 { - x.sqrt() - } - - /// DEPRECATED, use `std::u64::divide_and_round_up` instead - public fun divide_and_round_up(x: u64, y: u64): u64 { - x.divide_and_round_up(y) - } -} diff --git a/crates/iota-framework/packages/iota-framework/sources/pay.move b/crates/iota-framework/packages/iota-framework/sources/pay.move index 6775411e7e3..d09de62eba9 100644 --- a/crates/iota-framework/packages/iota-framework/sources/pay.move +++ b/crates/iota-framework/packages/iota-framework/sources/pay.move @@ -59,12 +59,6 @@ module iota::pay { vec.destroy_empty(); } - /// Join `coin` into `self`. Re-exports `coin::join` function. - /// Deprecated: you should call `coin.join(other)` directly. - public entry fun join(self: &mut Coin, coin: Coin) { - self.join(coin) - } - /// Join everything in `coins` with `self` public entry fun join_vec(self: &mut Coin, mut coins: vector>) { let (mut i, len) = (0, coins.length()); diff --git a/crates/iota-framework/packages/iota-framework/sources/tx_context.move b/crates/iota-framework/packages/iota-framework/sources/tx_context.move index 0d539c0eeb2..38e5d0d8838 100644 --- a/crates/iota-framework/packages/iota-framework/sources/tx_context.move +++ b/crates/iota-framework/packages/iota-framework/sources/tx_context.move @@ -17,7 +17,7 @@ module iota::tx_context { const ENoIDsCreated: u64 = 1; /// Information about the transaction currently being executed. - /// This cannot be constructed by a transaction--it is a privileged object created by + /// This cannot be constructed by a transaction. It is a privileged object created by /// the VM and passed in to the entrypoint of the transaction as `&mut TxContext`. public struct TxContext has drop { /// The address of the user that signed the current transaction @@ -52,7 +52,7 @@ module iota::tx_context { /// Return the epoch start time as a unix timestamp in milliseconds. public fun epoch_timestamp_ms(self: &TxContext): u64 { - self.epoch_timestamp_ms + self.epoch_timestamp_ms } /// Create an `address` that has not been used. As it is an object address, it will never diff --git a/crates/iota-framework/packages/iota-framework/sources/vec_map.move b/crates/iota-framework/packages/iota-framework/sources/vec_map.move index 1875ce26661..d1888096c1f 100644 --- a/crates/iota-framework/packages/iota-framework/sources/vec_map.move +++ b/crates/iota-framework/packages/iota-framework/sources/vec_map.move @@ -23,8 +23,8 @@ module iota::vec_map { const EUnequalLengths: u64 = 5; /// A map data structure backed by a vector. The map is guaranteed not to contain duplicate keys, but entries - /// are *not* sorted by key--entries are included in insertion order. - /// All operations are O(N) in the size of the map--the intention of this data structure is only to provide + /// are *not* sorted by key. Entries are included in insertion order. + /// All operations are O(N) in the size of the map. The intention of this data structure is only to provide /// the convenience of programming against a map API. /// Large maps should use handwritten parent/child relationships instead. /// Maps that need sorted iteration rather than insertion order iteration should also be handwritten. diff --git a/crates/iota-framework/packages/iota-framework/sources/vec_set.move b/crates/iota-framework/packages/iota-framework/sources/vec_set.move index c9a1387c1b8..9aaa8f09234 100644 --- a/crates/iota-framework/packages/iota-framework/sources/vec_set.move +++ b/crates/iota-framework/packages/iota-framework/sources/vec_set.move @@ -11,8 +11,8 @@ module iota::vec_set { const EKeyDoesNotExist: u64 = 1; /// A set data structure backed by a vector. The set is guaranteed not to - /// contain duplicate keys. All operations are O(N) in the size of the set - /// - the intention of this data structure is only to provide the convenience + /// contain duplicate keys. All operations are O(N) in the size of the set. + /// The intention of this data structure is only to provide the convenience /// of programming against a set API. Sets that need sorted iteration rather /// than insertion order iteration should be handwritten. public struct VecSet has copy, drop, store { diff --git a/crates/iota-framework/packages/iota-framework/tests/address_tests.move b/crates/iota-framework/packages/iota-framework/tests/address_tests.move index e9656da0016..75fc9a7a207 100644 --- a/crates/iota-framework/packages/iota-framework/tests/address_tests.move +++ b/crates/iota-framework/packages/iota-framework/tests/address_tests.move @@ -95,7 +95,7 @@ module iota::address_tests { assert!(@0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff.to_ascii_string() == b"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".to_ascii_string()); } - #[test] + #[test] fun to_string_ok() { assert!(@0x0.to_string() == b"0000000000000000000000000000000000000000000000000000000000000000".to_string()); assert!(@0x1.to_string() == b"0000000000000000000000000000000000000000000000000000000000000001".to_string()); diff --git a/crates/iota-framework/packages/iota-framework/tests/coin_tests.move b/crates/iota-framework/packages/iota-framework/tests/coin_tests.move index 848ceceda6e..676a848be40 100644 --- a/crates/iota-framework/packages/iota-framework/tests/coin_tests.move +++ b/crates/iota-framework/packages/iota-framework/tests/coin_tests.move @@ -2,7 +2,7 @@ // Modifications Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -#[test_only, allow(deprecated_usage)] +#[test_only] module iota::coin_tests { use iota::coin::{Self, Coin}; use iota::pay; diff --git a/crates/iota-framework/packages/iota-framework/tests/crypto/groth16_tests.move b/crates/iota-framework/packages/iota-framework/tests/crypto/groth16_tests.move index 6b8d8d67468..0c3e729d267 100644 --- a/crates/iota-framework/packages/iota-framework/tests/crypto/groth16_tests.move +++ b/crates/iota-framework/packages/iota-framework/tests/crypto/groth16_tests.move @@ -28,7 +28,7 @@ module iota::groth16_tests { let vk_bytes = arr.pop_back(); assert!(vk_bytes == expected_vk_bytes); - } + } #[test] #[expected_failure(abort_code = groth16::EInvalidVerifyingKey)] diff --git a/crates/iota-framework/packages/iota-framework/tests/crypto/poseidon_tests.move b/crates/iota-framework/packages/iota-framework/tests/crypto/poseidon_tests.move index 59ec6bc03cf..1561ce4033e 100644 --- a/crates/iota-framework/packages/iota-framework/tests/crypto/poseidon_tests.move +++ b/crates/iota-framework/packages/iota-framework/tests/crypto/poseidon_tests.move @@ -19,22 +19,22 @@ module iota::poseidon_tests { assert!(actual == expected); let msg = vector[1u256, 2u256, 3u256, 4u256, 5u256, 6u256, 7u256, 8u256, 9u256, 10u256, - 11u256, 12u256, 13u256, 14u256, 15u256]; + 11u256, 12u256, 13u256, 14u256, 15u256]; let expected = 4203130618016961831408770638653325366880478848856764494148034853759773445968u256; let actual = poseidon_bn254(&msg); assert!(actual == expected); let msg = vector[0u256, 1u256, 2u256, 3u256, 4u256, 5u256, 6u256, 7u256, 8u256, 9u256, - 10u256, 11u256, 12u256, 13u256, 14u256, 15u256, 16u256, 17u256, 18u256, 19u256, - 20u256, 21u256, 22u256, 23u256, 24u256, 25u256, 26u256, 27u256, 28u256, 29u256]; + 10u256, 11u256, 12u256, 13u256, 14u256, 15u256, 16u256, 17u256, 18u256, 19u256, + 20u256, 21u256, 22u256, 23u256, 24u256, 25u256, 26u256, 27u256, 28u256, 29u256]; let expected = 4123755143677678663754455867798672266093104048057302051129414708339780424023u256; let actual = poseidon_bn254(&msg); assert!(actual == expected); let msg = vector[0u256, 1u256, 2u256, 3u256, 4u256, 5u256, 6u256, 7u256, 8u256, 9u256, - 10u256, 11u256, 12u256, 13u256, 14u256, 15u256, 16u256, 17u256, 18u256, 19u256, - 20u256, 21u256, 22u256, 23u256, 24u256, 25u256, 26u256, 27u256, 28u256, 29u256, - 30u256, 31u256, 32u256]; + 10u256, 11u256, 12u256, 13u256, 14u256, 15u256, 16u256, 17u256, 18u256, 19u256, + 20u256, 21u256, 22u256, 23u256, 24u256, 25u256, 26u256, 27u256, 28u256, 29u256, + 30u256, 31u256, 32u256]; let expected = 15368023340287843142129781602124963668572853984788169144128906033251913623349u256; let actual = poseidon_bn254(&msg); assert!(actual == expected); diff --git a/crates/iota-framework/packages/iota-framework/tests/event_tests.move b/crates/iota-framework/packages/iota-framework/tests/event_tests.move index e8bd969ad14..cf2dfad34d8 100644 --- a/crates/iota-framework/packages/iota-framework/tests/event_tests.move +++ b/crates/iota-framework/packages/iota-framework/tests/event_tests.move @@ -40,7 +40,7 @@ module iota::event_tests { assert_eq(event::events_by_type().length(), 2) } - #[test] + #[test] fun test_emit_heterogenous() { let e0 = S1(0); let e1 = S2(1); diff --git a/crates/iota-framework/packages/iota-framework/tests/kiosk/kiosk_tests.move b/crates/iota-framework/packages/iota-framework/tests/kiosk/kiosk_tests.move index f25c4627e04..77f7d604780 100644 --- a/crates/iota-framework/packages/iota-framework/tests/kiosk/kiosk_tests.move +++ b/crates/iota-framework/packages/iota-framework/tests/kiosk/kiosk_tests.move @@ -292,15 +292,6 @@ module iota::kiosk_tests { abort 1337 } - #[test] - fun test_disallow_extensions_access_as_owner() { - let ctx = &mut test::ctx(); - let (mut kiosk, owner_cap) = test::get_kiosk(ctx); - - kiosk.set_allow_extensions(&owner_cap, false); - let _uid_mut = kiosk.uid_mut_as_owner(&owner_cap); - test::return_kiosk(kiosk, owner_cap, ctx); - } #[test] fun test_uid_access() { @@ -313,26 +304,4 @@ module iota::kiosk_tests { test::return_kiosk(kiosk, owner_cap, ctx); } - #[test] - #[expected_failure(abort_code = iota::kiosk::EUidAccessNotAllowed)] - fun test_disallow_extensions_uid_mut() { - let ctx = &mut test::ctx(); - let (mut kiosk, owner_cap) = test::get_kiosk(ctx); - - kiosk.set_allow_extensions(&owner_cap, false); - let _ = kiosk.uid_mut(); - - abort 1337 - } - - #[test] - fun test_disallow_extensions_uid_available() { - let ctx = &mut test::ctx(); - let (mut kiosk, owner_cap) = test::get_kiosk(ctx); - - kiosk.set_allow_extensions(&owner_cap, false); - let _ = kiosk.uid(); - - test::return_kiosk(kiosk, owner_cap, ctx); - } } diff --git a/crates/iota-framework/packages/iota-framework/tests/math_tests.move b/crates/iota-framework/packages/iota-framework/tests/math_tests.move deleted file mode 100644 index 3f6f7f16be5..00000000000 --- a/crates/iota-framework/packages/iota-framework/tests/math_tests.move +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -#[test_only, allow(deprecated_usage)] -module iota::math_tests { - use iota::math; - - #[test] - fun test_max() { - assert!(math::max(10, 100) == 100); - assert!(math::max(100, 10) == 100); - assert!(math::max(0, 0) == 0); - } - - #[test] - fun test_min() { - assert!(math::min(10, 100) == 10); - assert!(math::min(100, 10) == 10); - assert!(math::min(0, 0) == 0); - } - - #[test] - fun test_pow() { - assert!(math::pow(1, 0) == 1); - assert!(math::pow(3, 1) == 3); - assert!(math::pow(2, 10) == 1024); - assert!(math::pow(10, 6) == 1000000); - } - - #[test] - #[expected_failure] - fun test_pow_overflow() { - math::pow(10, 100); - } - - #[test] - fun test_perfect_sqrt() { - let mut i = 0; - while (i < 1000) { - assert!(math::sqrt(i * i) == i); - i = i + 1; - }; - let mut i = 0xFFFFFFFFFu128; - while (i < 0xFFFFFFFFFu128 + 1) { - assert!(math::sqrt_u128(i * i) == i); - i = i + 1; - } - } - - #[test] - // This function tests whether the (square root)^2 equals the - // initial value OR whether it is equal to the nearest lower - // number that does. - fun test_imperfect_sqrt() { - let mut i = 1; - let mut prev = 1; - while (i <= 1000) { - let root = math::sqrt(i); - - assert!(i == root * root || root == prev); - - prev = root; - i = i + 1; - } - } - - #[test] - fun test_sqrt_big_numbers() { - let u64_max = 18446744073709551615; - assert!(4294967295 == math::sqrt(u64_max)) - } -} diff --git a/crates/iota-framework/packages/iota-framework/tests/timelock/timelocked_balance_tests.move b/crates/iota-framework/packages/iota-framework/tests/timelock/timelocked_balance_tests.move index 82fa561f3b9..ed1e69e9371 100644 --- a/crates/iota-framework/packages/iota-framework/tests/timelock/timelocked_balance_tests.move +++ b/crates/iota-framework/packages/iota-framework/tests/timelock/timelocked_balance_tests.move @@ -265,7 +265,7 @@ module iota::timelocked_balance_tests { scenario.end(); } - #[test] + #[test] fun test_split_and_transfer_timelocked_balances() { // Set up a test environment. let sender = @0xA; diff --git a/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move b/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move index c5cd343cb39..9788e123a18 100644 --- a/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move +++ b/crates/iota-framework/packages/iota-system/sources/timelocked_staking.move @@ -83,7 +83,7 @@ module iota_system::timelocked_staking { let (timelocked_balance, reward) = request_withdraw_stake_non_entry(iota_system, timelocked_staked_iota, ctx); // Transfer the withdrawn time-locked balance to the sender. - timelocked_balance.transfer_to_sender(ctx); + timelocked_balance.transfer_to_sender(ctx); // Send coins only if the reward is not zero. if (reward.value() > 0) { @@ -312,8 +312,8 @@ module iota_system::timelocked_staking { fun transfer_multiple(mut stakes: vector, receiver: address) { // Transfer all the time-locked stakes to the recipient. while (!stakes.is_empty()) { - let stake = stakes.pop_back(); - transfer::transfer(stake, receiver); + let stake = stakes.pop_back(); + transfer::transfer(stake, receiver); }; // Destroy the empty vector. diff --git a/crates/iota-framework/packages/iota-system/sources/validator.move b/crates/iota-framework/packages/iota-system/sources/validator.move index 4b4b7175ccf..3e19f8fddf8 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator.move +++ b/crates/iota-framework/packages/iota-system/sources/validator.move @@ -557,7 +557,7 @@ module iota_system::validator { // MUSTFIX: We need to check this when updating metadata as well. public fun is_duplicate(self: &ValidatorV1, other: &ValidatorV1): bool { - self.metadata.iota_address == other.metadata.iota_address + self.metadata.iota_address == other.metadata.iota_address || self.metadata.name == other.metadata.name || self.metadata.net_address == other.metadata.net_address || self.metadata.p2p_address == other.metadata.p2p_address diff --git a/crates/iota-framework/packages/iota-system/sources/validator_set.move b/crates/iota-framework/packages/iota-system/sources/validator_set.move index a725dbc3a6a..b0579a00205 100644 --- a/crates/iota-framework/packages/iota-system/sources/validator_set.move +++ b/crates/iota-framework/packages/iota-system/sources/validator_set.move @@ -180,7 +180,7 @@ module iota_system::validator_set { /// Called by `iota_system` to remove a validator candidate, and move them to `inactive_validators`. public(package) fun request_remove_validator_candidate(self: &mut ValidatorSetV1, ctx: &mut TxContext) { let validator_address = ctx.sender(); - assert!( + assert!( self.validator_candidates.contains(validator_address), ENotValidatorCandidate ); @@ -424,7 +424,7 @@ module iota_system::validator_set { if (stake >= low_stake_threshold) { // The validator is safe. We remove their entry from the at_risk map if there exists one. if (self.at_risk_validators.contains(&validator_address)) { - self.at_risk_validators.remove(&validator_address); + self.at_risk_validators.remove(&validator_address); } } else if (stake >= very_low_stake_threshold) { // The stake is a bit below the threshold so we increment the entry of the validator in the map. @@ -548,7 +548,7 @@ module iota_system::validator_set { self: &ValidatorSetV1, validator_address: address, ): bool { - find_validator(&self.active_validators, validator_address).is_some() + find_validator(&self.active_validators, validator_address).is_some() } // ==== private helpers ==== diff --git a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move index e7d1ba96f28..295a04d6d8c 100644 --- a/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move +++ b/crates/iota-framework/packages/iota-system/tests/timelocked_delegation_tests.move @@ -925,12 +925,12 @@ module iota_system::timelocked_stake_tests { // The computation reward is lower than the target reward, so 400 IOTA should be minted. // Each validator pool has 50% of the voting power and thus gets 50% of the reward (400 IOTA). assert_validator_total_stake_amounts( - validator_addrs(), - vector[ - (200 + 400) * NANOS_PER_IOTA, - (200 + 400) * NANOS_PER_IOTA, - ], - scenario + validator_addrs(), + vector[ + (200 + 400) * NANOS_PER_IOTA, + (200 + 400) * NANOS_PER_IOTA, + ], + scenario ); unstake_timelocked(STAKER_ADDR_1, 0, scenario); @@ -963,12 +963,12 @@ module iota_system::timelocked_stake_tests { // The computation reward is higher than the target reward, so 200 IOTA should be burned. // Each validator pool has 50% of the voting power and thus gets 50% of the reward (400 IOTA). assert_validator_total_stake_amounts( - validator_addrs(), - vector[ - (200 + 400) * NANOS_PER_IOTA, - (250 + 400) * NANOS_PER_IOTA, - ], - scenario + validator_addrs(), + vector[ + (200 + 400) * NANOS_PER_IOTA, + (250 + 400) * NANOS_PER_IOTA, + ], + scenario ); unstake_timelocked(STAKER_ADDR_1, 0, scenario); diff --git a/crates/iota-framework/packages/stardust/sources/nft/irc27.move b/crates/iota-framework/packages/stardust/sources/nft/irc27.move index 7c3a04b66a0..07a1034c887 100644 --- a/crates/iota-framework/packages/stardust/sources/nft/irc27.move +++ b/crates/iota-framework/packages/stardust/sources/nft/irc27.move @@ -115,7 +115,7 @@ module stardust::irc27 { attributes: _, non_standard_fields: _, } = irc27; - } + } #[test_only] public fun create_for_testing( diff --git a/crates/iota-framework/packages_compiled/iota-framework b/crates/iota-framework/packages_compiled/iota-framework index 2568bfa127598555e32ab71294da1fb2298adf35..5ad34b2f1358bfe2a85b4030fd240e40107cc641 100644 GIT binary patch delta 3109 zcmZ`*TWlOx8UD{@X3m^5yWUx^9eaJh?Rq`l^=0kd+4cRFyOWe8ZPVN;@lX&dY6WVO zAXt!i;svQwDj}gL1qsAMm8M3RCMGHL0Z}0#ArX=%5C|aw5}-&R9%%Xh*>zK-vX;N| zo&P>(&iT(=|E~Ptb;&BXSnc`72R*O%{>9h;kYLcoyH1HueO<_ZiAn1_@>S{Vs_R<) zI=yOtqkUZexP8NXIitO=WnOaJ61uX11D6Vf<$y>?unY$$>3~uWxVFOpG&18k0H?_f&T@fxg8bp6Wg}j8 zNS>w~(C%u)DT6tn=HU~;Cz8aEw51SNe8S^tl1!%C5ua^jXfolEqPwG$amXI%LR{@8 z`FfT@WO^vUP%qhx$2i>Ak9=f+aBPs|qcP@&NRl5WTpJ|Y7ERmtpLTK6ifyx2m&{dffq~#g# z;2insxFQ+z6pOz7@+b?VpS`>_R5ws#oDOlqHc-d*;fIEC7X>NDaK9cEujJ77%$1u* z>Y+m0HnPR{x^El0oQ_$lI|-qd(o&epfxNbTj2)U97-F~q{dJ7DYNWp&9lttk>c*}K z58poKxO%mh)uY$0<{P1b3K$;xyaR*Im@w^c`YWC^fc;1sj$x*G=l@ex`GJqBMC>In zIrnFH7pZhBAdgktFn^YJlcK}0D$hiV*HUeiaNm{tbJ6*0y(|AKEAyU@4>r$xN#VA# z;CaEanO}*1cD z?cb%Y=m-8M&7HLJ-c8>~B>pgvN zz*e>& z;9&OvK*!(^I(E9lhzHye#8ab`V16uz7f3#b^l*$v^ZmFxFCNA&&n~kmY`kMLvxvu+ zu@&>PM~GisM6GBKS%W)L3?J)aj@X{7(&WV4JPs0d-0@_`u@f|O&Yh$oHk2dBx@Z#H zd)6Sf72)(0890TZ98=B$6v4UBlLK`IRZ2Y>Ai9gIYuKWnDD;BqJA}8OnL3F3Y-wX+ zadNy=n=F)kozm0gN+qL<NSt$(#YUkXaarJ2gy(fLa0 zcxijKQm#Zlz4hMCt8YDEJ74_4O&+c7o{d)C9gg1F{eJYhAI&x-9`{Y7u}!U5(@DlT z&PP>(b5hKy#EeSR1)lyUm7En+!Xm3g!0dSDa51YADA*9{F?Bg_N*(QDty}|0822>z zxcnZT7y~7LC2Y_s#ZHM^YCMg~dWe>&ID+3a_-%rQC`0>1N-rL=5CHl$R zUu8~o@b)m%(Wh^3BktawWx43jw^xu)+!4r7NXDGd7iCD5AWoder2zO?PhAP zE4i_0SY3EFmVwcuvwNRso6&oFMJJ5=+}6(fdv!L6%^=0&BhRoAr63cZ@|d#>@5ASc zxd^*>fAp=pSvC;u-pwa_7WVLw{fcCUkG6Ofs~+3uSamM? z?Y)j9$JfGzrETqKDDTL39wv5*zx;(AylL+@D7*?3$2%!~NS;et&wa`HBYT6XSHz(G zmeAgw_<1yXf3{*L{nHKAb zX!b$5ksN3_uhYY2!Odr^gKkR%+`{as?Bh`E zqoF!1onTw8hvxt{sbxg;j|Z8;V`m$k-E-w^G9Ix%;`)zliwqEwyHULB!)bsj##Kv<%en<9NFUs#r=PmV1t^S#u zv0qJf=?_x}>vPzMQ`1MBmFKVt>sfpcYcl1_$6CxEJn+6_#WN*->^MFqZ)X9->kt zn^2Y^3V|91vP_MZh}=>jYzIV4g5`2>;tr^Y0};nz02(C|bpTFK7%X#)hdTiS;kacZ zt~#VoIXDueBN}m##)AnL=LKJjk$guyfjHw4E+t9RS5Bs|c_d98-z7t1O)cY)sjEkv zZ6N)8Bc-Ux&;adC0Xcneu61^XePm2 zdwQ^iac6(`ET~fV5U8U=-4HqA&oR&s4|RbVPZaU9P8PeN-yiV%eC7B05nuYQKj`=P zQ+}79@Fzwl#wN#ozuRB%lm0$;ZkE|bum~{0j5tYxaR}{7<5Y~!juI+1n;OT2J;zXw zhv+E7D%!9sDmH;?j$+`PZCy4@SL2j%Fiwa6OpGa)+`{n;!;I=bjSQ`#VwGqOT`)h@ zPWgjxovkY?$B@k;S6eB|#&Q@Z30L?Tq$=P{o6h;)h_J94W;hzrMC&T5Z5Y5*0>@QCa~dA24MnU>Rz+E{ zqOqz$8%+!&I8GCn49f_9ey%wYpWixver@CHSLV;Jt!}QJ+J5KUq;%{HTW8Ncer4Oa zIKmbSN~bEravSAlzM$fFt7wmk=fk;hE>K;kB3Ts?oTGdqELn!K$1Kj8d2sbo2P+0Y zzO>j@GEiikPI%NdFo6u?6%FGNR3se3y;5LZ?nK|-%P*!&1%)7qg7v2SOgL|-Yf62Xn6ZE2eVgf@CfCffDdm1I^`~g` zqiizvudE$^x{bpK)IcM&LKfP=hbg=x?t}Yr#I+Y!${D;9U=lb$gOJG47Ise%m(L=X zyHG?nb72{|+=V=z1Q+I9!sZC!!DtMzfQ;_K5s&0MlcZlwVXBEViSr?ztf@sZuB%7Z zMoxEOfW$t8GW3&}Ye0CY0iEt{#IYa9GyyzFF*BKFT(V3H!2V1tz=4J=Ky6z)rl^bT zL9CB-ARgaKLydRl@OtUWp?E07!(FYoJs&>QN`%Y?k&ruwM-Z2$k)rwX9VnOi!~4)I zQn*hYDfS$xXO1{JR-n$Yv2ko1F)P#<*<48SqLVwq4(~JqHsh@$< z)1G6>nS_3DR+@64?m?4M_x2)2_RSJ?-__F$rsd!gUXo_;0B*o(f2yx%pw#CNcsikn zM+^D19vCf7l(eOl9vUr{`Ui%mdIyR#GkU&tuC;rhZ(v|*BtL#QpC4QrJUW^m%LmWA z^m_+64{XJ@mtOvWd5P7>A3t+xW$p6j+Qx;`XErVbpFh>OJ@bp_cuo4k+UCmtnBV`^ z3FT~^KDDyGwHfrh@(y!?zrRu{TRkeaXf#sKj5QR)Z^}7p_Npl75`{4p9ahnjKmw_V zlCvHawa6>l%j~e{a4|x}6I~E$SB!98(KwuYZ;beu5?Ar^7a|o zCOxYLS=xb|vBNxVve9ZGjmROJOc)FQBc~N)(009<%?8ugpJ6Ka?e%tMg1=o~LL9p> z%yPkFH>Od3{s!*L;GG-IY%=)h#yXo1mTz{V{>hvDsCnULeQaUDunFPXSOcaG-n+TU z7K4MY^*IwEN$%hN=4%tI9MeP#_0qB;cx6&`IJdY}6Y>f}c1ZA$Nf<6t!b

IXU#= zycuWBkQ5V;=JfapWtQf+%PX=d)blKLF#Ny9fw<-4Q(T zdTZ9?aMd;UYO~=|VR?~o*wC|$?+Grx-qH6}P8w^|luqIIEC}=$yaV$d58i&g=RRFY zB9hXuLWb|%sa2+VXI0MQe25-tK6#uEz1BjRr#aG>z-_>Aci_h3c%|9e!OaAt+XvtH zAX@$d-=R@tHe1;Hts}-+o>M<$Gwug$8SrwaOPZ)q5@0F-y!ZfY+Hj7*?8qVbJVFVn z64`^goFX_yaB}A4%<)kzxZq5JJazifM^mRxUo4(JwYIXlacbrKnJvVvvvPfP^D(i$ zdReTW-VkTcT#^^go!^WQtZWSp7bJn$8XpbbOwBA~evmk8{8&0X0M(8OcX+jfCu-Nt z<@6?(xK+F;Cq@rN2MhcnQ-p74-+kBi-?Dd>25)f1l@`e*xe~M1pL9NEFEI53k+okH z+Wn2V9n{|%p0q4l5xcT3^xS8X({nh~<9S6sw~9mjauO= zFnHnCV({6mzu1ttg_e6{t)(@@m=<%fAbWeH9B-v%(0C$U zYd6H2)w>~$Ry=AgYR&sS7fD0VoWozOD=dwN+gSUNV=6yf9Q=IY+7>Ka9tmFKZeI4~ ryfv1N3bv?&-`#HM-c8_Oj84X2R(}!KA#F?Hv5mr_-j4tAlj6StV6Bk% diff --git a/crates/iota-framework/published_api.txt b/crates/iota-framework/published_api.txt index 8bd50d6ea10..7b25f4da602 100644 --- a/crates/iota-framework/published_api.txt +++ b/crates/iota-framework/published_api.txt @@ -1933,9 +1933,6 @@ TreasuryCap DenyCapV1 public struct 0x2::coin -CurrencyCreated - public struct - 0x2::coin total_supply public fun 0x2::coin @@ -2053,9 +2050,6 @@ get_description get_icon_url public fun 0x2::coin -supply - public fun - 0x2::coin CoinManager public struct 0x2::coin_manager @@ -2611,15 +2605,9 @@ has_access uid_mut_as_owner public fun 0x2::kiosk -set_allow_extensions - public fun - 0x2::kiosk uid public fun 0x2::kiosk -uid_mut - public fun - 0x2::kiosk owner public fun 0x2::kiosk @@ -2770,27 +2758,6 @@ destroy_empty drop public fun 0x2::linked_table -max - public fun - 0x2::math -min - public fun - 0x2::math -diff - public fun - 0x2::math -pow - public fun - 0x2::math -sqrt - public fun - 0x2::math -sqrt_u128 - public fun - 0x2::math -divide_and_round_up - public fun - 0x2::math ObjectBag public struct 0x2::object_bag @@ -2875,9 +2842,6 @@ split_and_transfer divide_and_keep public entry fun 0x2::pay -join - public entry fun - 0x2::pay join_vec public entry fun 0x2::pay From 6aa4029e561e16a0690d0f03483281cec2517815 Mon Sep 17 00:00:00 2001 From: miker83z Date: Mon, 28 Oct 2024 12:07:23 +0100 Subject: [PATCH 60/62] fix(iota-framework-snapshot): update manifest --- crates/iota-framework-snapshot/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/iota-framework-snapshot/manifest.json b/crates/iota-framework-snapshot/manifest.json index af63d8fe734..a1d2ede02b0 100644 --- a/crates/iota-framework-snapshot/manifest.json +++ b/crates/iota-framework-snapshot/manifest.json @@ -1,6 +1,6 @@ { "1": { - "git_revision": "a85ff06d86c3", + "git_revision": "f1f6c498eb44", "package_ids": [ "0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002", From 38c07126e122c7d5077e61e432f9b241ee1fb713 Mon Sep 17 00:00:00 2001 From: Gino Osahon Date: Mon, 28 Oct 2024 12:31:53 +0100 Subject: [PATCH 61/62] feat(devx): Create tutorial for coffee example (#2707) * feat(docs) create tutorial for coffee example * fix(docs) update code block Co-authored-by: vivekjain23 <165671934+vivekjain23@users.noreply.github.com> * fix(docs) implement review suggestions * fix(docs) move tutorial to getting started section * fix(docs) use second person plural instead of first * fix(docs) remove gas budget flag * fix(docs) import code snippets * fix(docs) implement review suggestions * feat(docs) add move project to example folder * fix(devx) implement review * fix(devx) update dependencies * fix(update toml file) * fix(devx) update toml file * fix(devx) fix toml file * fix(devx) format toml file * fix(devx) fix fetch advisory database --------- Co-authored-by: vivekjain23 <165671934+vivekjain23@users.noreply.github.com> --- .../getting-started/coffee-example.mdx | 282 ++++++++++++++++++ docs/content/sidebars/developer.js | 1 + docs/examples/move/coffee_shop/Move.toml | 9 + .../move/coffee_shop/sources/coffee.move | 99 ++++++ 4 files changed, 391 insertions(+) create mode 100644 docs/content/developer/getting-started/coffee-example.mdx create mode 100644 docs/examples/move/coffee_shop/Move.toml create mode 100644 docs/examples/move/coffee_shop/sources/coffee.move diff --git a/docs/content/developer/getting-started/coffee-example.mdx b/docs/content/developer/getting-started/coffee-example.mdx new file mode 100644 index 00000000000..f5c5980e71f --- /dev/null +++ b/docs/content/developer/getting-started/coffee-example.mdx @@ -0,0 +1,282 @@ +--- +title: Getting Started with Move Coffee Token Tutorial +tags: + - tutorial + - move + - getting-started +--- + +## Introduction + +Welcome to this beginner-friendly tutorial on [Move](../iota-101/move-overview/move-overview.mdx) programming! You will build a simple Coffee Shop example that allows customers to buy, claim, and transfer coffee tokens. The example demonstrates fundamental concepts like importing modules, defining [constants](https://move-language.github.io/move/constants.html), creating [structs](https://move-language.github.io/move/structs-and-resources.html), minting and burning tokens, and handling [control](https://move-language.github.io/move/loops.html) flow. + +### Key Concepts Covered + +1. [**Importing modules**](https://moved.network/docs/move-basics/importing-modules): You will import essential Move packages for transactions, tokens, and balances. +2. [**Defining constants**](https://move-language.github.io/move/constants.html): Used to represent error codes and set a price for coffee. +3. **Creating [structs](https://move-language.github.io/move/structs-and-resources.html) with [abilities](https://move-language.github.io/move/abilities.html)**: Defined the `COFFEE` and `CoffeeShop` structs to represent tokens and shop data. +4. [**Initialization with OTW**](../iota-101/move-overview/one-time-witness.mdx): Set up the shop with its treasury cap for minting tokens. +5. [**Control flow with assertions**](https://move-language.github.io/move/loops.html): Ensured correct amounts and balances in transactions. +6. **[Transferring](../iota-101/objects/transfers/transfers.mdx) and burning tokens**: Demonstrated how tokens are moved between users and how they can be consumed (burned). + +## Prerequisites + +- Basic understanding of blockchain concepts like [tokens](../../references/framework/iota-framework/token.mdx) and [transactions](https://www.scalingparrots.com/en/what-is-a-blockchain-transaction/). +- Basic understanding of the [Move](../iota-101/move-overview/move-overview.mdx) +- [Install Iota CLI](install-iota.mdx) + +## 1. Create an IOTA Move Package + +Use the following command to create a standard IOTA Move [package](create-a-package.mdx) called `coffee_shop`: + +``` bash +iota move new coffee_shop +``` + +The command will create and populate the `coffee_shop` directory with a skeleton for an IOTA Move project. To add a [module](create-a-module.mdx), create a `.move` file in the sources directory, and call it `coffee.move`. In `coffee.move`, paste the following codes to the `coffee` module: + +## 2. Importing Modules from the IOTA Package + +The first step in our program is importing necessary modules from the IOTA package. These modules provide functionalities for transaction handling, coins, balances, and tokens. + +```move file=/examples/move/token/sources/coffee.move#L8-L12 +``` + +- [`iota::tx_context::sender`](../../references/framework/iota-framework/tx_context.mdx): Manages the transaction context. +- [`iota::coin`](../../references/framework/iota-framework/coin.mdx): Handles the creation and management of coins. +- [`iota::balance`](../../references/framework/iota-framework/balance.mdx): Manages the balance of the shop. +- [`iota::token`](../../references/framework/iota-framework/token.mdx): Manages the minting, transfer, and burning of tokens. +- [`iota::iota::IOTA`](../../references/framework/iota-framework/iota.mdx): The IOTA cryptocurrency module. + +## 3. Defining Constants + +In this step, you should define a few constants that represent different error codes and the price of a coffee. [Constants](https://move-language.github.io/move/constants.html) in Move are useful for defining fixed values used throughout the code. + +```move file=/examples/move/token/sources/coffee.move#L14-L21 +``` + +- `EIncorrectAmount`: Error when the wrong amount is provided. +- `ENotEnoughPoints`: Error when there aren’t enough points to complete a transaction. +- `COFFEE_PRICE`: The price of a coffee (10 IOTA). + +## 4. Creating Structs with Abilities + +[Structs](https://move-language.github.io/move/structs-and-resources.html) in Move represent data storage objects, and you will define two structs in this program. + +[Abilities](https://docs.iota.org/developer/getting-started/create-a-module#abilities) in Move are a typing feature in Move that control what actions are permissible for values of a given type. + +1. `COFFEE`: A struct representing coffee points. +2. `CoffeeShop`: A struct for the coffee shop that includes its treasury cap and IOTA balance. + +```move file=/examples/move/token/sources/coffee.move#L23-L34 +``` + +- `COFFEE`: A token with the ability drop, allowing it to be destroyed when no longer needed. +- `CoffeeShop`: Represents a shop that has an ID, a treasury for minting coffee points, and a balance in IOTA. + +## 5. Initialization with OneTimeWitness (OTW) + +In Move, the [init](../iota-101/move-overview/init.mdx) function plays a critical role during the module's lifecycle, executing only once at the moment of module publication. +The init function initializes the CoffeeShop by creating the COFFEE token and defining the shop’s treasury cap and balance. + +A [One-Time Witness (OTW)](../iota-101/move-overview/one-time-witness.mdx) is a unique type in Move, specifically designed to ensure that certain actions within a module can only occur once, providing security for the system's setup. + +### Function Arguments + +- `otw: COFFEE`: A token witness that allows the creation of the COFFEE tokens. It ensures that the token setup can only happen once during initialization. +- `ctx: &mut TxContext`: The transaction context, which provides necessary data about the current transaction, including the sender and other blockchain-related information + +```move file=/examples/move/token/sources/coffee.move#L40-L55 +``` + +Here, you use the OneTimeWitness (OTW) pattern, where `COFFEE` is used as a witness to authorize the creation of a new currency called `COFFEE`. The shop’s balance starts at zero. + +## 6. Buying a Coffee (Token Transfer) + +The `buy_coffee` function enables customers to purchase coffee using IOTA tokens. In this process, you will also apply control flow using assertions to ensure the customer has sufficient funds. If the required conditions are met, the transaction proceeds; otherwise, an error is triggered, making this a crucial aspect of program logic. + +### Function Arguments + +- `app: &mut CoffeeShop`: A mutable reference to the `CoffeeShop` struct, which holds the shop's token treasury and balance. +- `payment: Coin`: The amount of IOTA tokens that the customer pays for the coffee. This is a `Coin` type representing IOTA currency. +- `ctx: &mut TxContext`: The transaction context that handles information about the sender and the blockchain transaction. + +```move file=/examples/move/token/sources/coffee.move#L57-L69 +``` + +This function performs key tasks like checking the customer’s balance, minting 1 new `COFFEE` token, transferring it to the customer, and [confirming](../../developer/standards/closed-loop-token/action-request#request-confirmation) the transaction. + +## 7. Control Flow with Assertions + +Move uses assertions (`assert!`) to enforce logical conditions during execution. If an assertion fails, it aborts the function with the defined error code. + +```move file=/examples/move/token/sources/coffee.move#L60-L61 +``` + +In this example, you will ensure the customer has enough IOTA to buy coffee. If not, it returns the `EIncorrectAmount` error. + +## 8. Claiming a Free Coffee (Burning Tokens) + +After purchasing 4 coffees, customers can claim a free coffee by burning their `COFFEE` points. In Move, burning tokens permanently removes them from circulation, ensuring they can’t be reused. This process is vital in controlling token supply and enforcing business logic in applications. + +### Function Arguments + +- `app: &mut CoffeeShop`: A mutable reference to the `CoffeeShop` struct, holding the shop’s treasury cap and token information. +- `points: Token`: The `COFFEE` tokens that the customer is using to claim a free coffee. The token value must equal 4 for the transaction to proceed. +- `ctx: &mut TxContext`: The transaction context, which includes details about the sender and the blockchain transaction. + +```move file=/examples/move/token/sources/coffee.move#L71-L82 +``` + +This function ensures the customer has exactly 4 points, spends them, and emits a purchase event, marking the reward for loyalty. + +## 9. Transferring Tokens + +The `transfer` function enables customers to [transfer](../../references/framework/iota-framework/transfer.mdx) their `COFFEE` tokens to others, but with a 1-point fee deducted as commission. This demonstrates how Move can enforce rules and fees during token transfers, ensuring a fair system of exchange. + +### Function Arguments + +- `app: &mut CoffeeShop`: A mutable reference to the `CoffeeShop` struct, which includes the shop's treasury and balance information. +- `mut points: Token`: The `COFFEE` tokens being transferred. The token value is mutable because 1 token will be deducted as a transfer fee. +- `recipient: address`: The recipient's blockchain address to which the tokens will be transferred. +- `ctx: &mut TxContext`: The transaction context that includes details about the sender and manages interaction with the blockchain. + +```move file=/examples/move/token/sources/coffee.move#L84-L98 +``` + +The function first checks if the user has enough points, splits off 1 point as the transfer fee, sends the remaining points to the recipient, and burns the 1-point commission from the system's treasury, removing it from circulation. + +## Full Contract + +

+Click to view code + +```move +// Copyright (c) Mysten Labs, Inc. +// Modifications Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +/// This example illustrates how to use the `Token` without a `TokenPolicy`. And +/// only rely on `TreasuryCap` for minting and burning tokens. +module coffee_shop::coffee { + use iota::tx_context::sender; + use iota::coin::{Self, TreasuryCap, Coin}; + use iota::balance::{Self, Balance}; + use iota::token::{Self, Token}; + use iota::iota::IOTA; + + /// Error code for incorrect amount. + const EIncorrectAmount: u64 = 0; + /// Trying to claim a free coffee without enough points. + /// Or trying to transfer but not enough points to pay the commission. + const ENotEnoughPoints: u64 = 1; + + /// 10 IOTA for a coffee. + const COFFEE_PRICE: u64 = 10_000_000_000; + + /// OTW for the Token. + public struct COFFEE has drop {} + + /// The shop that sells Coffee and allows to buy a Coffee if the customer + /// has 10 COFFEE points. + public struct CoffeeShop has key { + id: UID, + /// The treasury cap for the `COFFEE` points. + coffee_points: TreasuryCap, + /// The IOTA balance of the shop; the shop can sell Coffee for IOTA. + balance: Balance, + } + + /// Event marking that a Coffee was purchased; transaction sender serves as + /// the customer ID. + public struct CoffeePurchased has copy, store, drop {} + + // Create and share the `CoffeeShop` object. + fun init(otw: COFFEE, ctx: &mut TxContext) { + let (coffee_points, metadata) = coin::create_currency( + otw, 0, b"COFFEE", b"Coffee Point", + b"Buy 4 coffees and get 1 free", + std::option::none(), + ctx + ); + + iota::transfer::public_freeze_object(metadata); + iota::transfer::share_object(CoffeeShop { + coffee_points, + id: object::new(ctx), + balance: balance::zero(), + }); + } + + /// Buy a coffee from the shop. Emitted event is tracked by the real coffee + /// shop and the customer gets a free coffee after 4 purchases. + public fun buy_coffee(app: &mut CoffeeShop, payment: Coin, ctx: &mut TxContext) { + // Check if the customer has enough IOTA to pay for the coffee. + assert!(coin::value(&payment) > COFFEE_PRICE, EIncorrectAmount); + + let token = token::mint(&mut app.coffee_points, 1, ctx); + let request = token::transfer(token, sender(ctx), ctx); + + token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx); + coin::put(&mut app.balance, payment); + iota::event::emit(CoffeePurchased {}) + } + + /// Claim a free coffee from the shop. Emitted event is tracked by the real + /// coffee shop and the customer gets a free coffee after 4 purchases. The + /// `COFFEE` tokens are spent. + public fun claim_free(app: &mut CoffeeShop, points: Token, ctx: &mut TxContext) { + // Check if the customer has enough `COFFEE` points to claim a free one. + assert!(token::value(&points) == 4, EIncorrectAmount); + + // While you could use `burn`, spend illustrates another way of doing this + let request = token::spend(points, ctx); + token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx); + iota::event::emit(CoffeePurchased {}) + } + + /// you will allow transfer of `COFFEE` points to other customers but you charge 1 + /// `COFFEE` point for the transfer. + public fun transfer( + app: &mut CoffeeShop, + mut points: Token, + recipient: address, + ctx: &mut TxContext + ) { + assert!(token::value(&points) > 1, ENotEnoughPoints); + let commission = token::split(&mut points, 1, ctx); + let request = token::transfer(points, recipient, ctx); + + token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx); + token::burn(&mut app.coffee_points, commission); + } +} +``` + +
+ +## 10. Building your Package + +You can use the `iota move build` command to [build](build-test.mdx) Move packages in the working directory, `coffee_shop` in this case. + +```bash +iota move build +``` + +## 11. Publish the `coffee_shop` package by running the following command: + +```bash +iota client publish +``` + +The console will respond with the transaction effects. You should pay attention to the created objects to retrieve the object IDs. + +## Conclusion + +In this tutorial, you explored the basics of Move programming by building a simple Coffee Shop application. You learned how to import modules, define constants, create structs, mint and burn tokens, and manage control flow with assertions. With this foundational knowledge, you can now begin experimenting with more advanced Move features and expand your decentralized applications. Happy coding! + + + + + + diff --git a/docs/content/sidebars/developer.js b/docs/content/sidebars/developer.js index b96192b54a1..54656da5b35 100644 --- a/docs/content/sidebars/developer.js +++ b/docs/content/sidebars/developer.js @@ -26,6 +26,7 @@ const developer = [ 'developer/getting-started/publish', 'developer/getting-started/debug', 'developer/getting-started/client-tssdk', + 'developer/getting-started/coffee-example', ], }, { diff --git a/docs/examples/move/coffee_shop/Move.toml b/docs/examples/move/coffee_shop/Move.toml new file mode 100644 index 00000000000..1de98af0d74 --- /dev/null +++ b/docs/examples/move/coffee_shop/Move.toml @@ -0,0 +1,9 @@ +[package] +name = "coffee_shop" +edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move + +[dependencies] +Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/testnet" } + +[addresses] +coffee_shop = "0x0" diff --git a/docs/examples/move/coffee_shop/sources/coffee.move b/docs/examples/move/coffee_shop/sources/coffee.move new file mode 100644 index 00000000000..6893f8d9312 --- /dev/null +++ b/docs/examples/move/coffee_shop/sources/coffee.move @@ -0,0 +1,99 @@ +// Copyright (c) Mysten Labs, Inc. +// Modifications Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +/// This example illustrates how to use the `Token` without a `TokenPolicy`. And +/// only rely on `TreasuryCap` for minting and burning tokens. +module coffee_shop::coffee { + use iota::tx_context::sender; + use iota::coin::{Self, TreasuryCap, Coin}; + use iota::balance::{Self, Balance}; + use iota::token::{Self, Token}; + use iota::iota::IOTA; + + /// Error code for incorrect amount. + const EIncorrectAmount: u64 = 0; + /// Trying to claim a free coffee without enough points. + /// Or trying to transfer but not enough points to pay the commission. + const ENotEnoughPoints: u64 = 1; + + /// 10 IOTA for a coffee. + const COFFEE_PRICE: u64 = 10_000_000_000; + + /// OTW for the Token. + public struct COFFEE has drop {} + + /// The shop that sells Coffee and allows to buy a Coffee if the customer + /// has 10 COFFEE points. + public struct CoffeeShop has key { + id: UID, + /// The treasury cap for the `COFFEE` points. + coffee_points: TreasuryCap, + /// The IOTA balance of the shop; the shop can sell Coffee for IOTA. + balance: Balance, + } + + /// Event marking that a Coffee was purchased; transaction sender serves as + /// the customer ID. + public struct CoffeePurchased has copy, store, drop {} + + // Create and share the `CoffeeShop` object. + fun init(otw: COFFEE, ctx: &mut TxContext) { + let (coffee_points, metadata) = coin::create_currency( + otw, 0, b"COFFEE", b"Coffee Point", + b"Buy 4 coffees and get 1 free", + std::option::none(), + ctx + ); + + iota::transfer::public_freeze_object(metadata); + iota::transfer::share_object(CoffeeShop { + coffee_points, + id: object::new(ctx), + balance: balance::zero(), + }); + } + + /// Buy a coffee from the shop. Emitted event is tracked by the real coffee + /// shop and the customer gets a free coffee after 4 purchases. + public fun buy_coffee(app: &mut CoffeeShop, payment: Coin, ctx: &mut TxContext) { + // Check if the customer has enough IOTA to pay for the coffee. + assert!(coin::value(&payment) > COFFEE_PRICE, EIncorrectAmount); + + let token = token::mint(&mut app.coffee_points, 1, ctx); + let request = token::transfer(token, sender(ctx), ctx); + + token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx); + coin::put(&mut app.balance, payment); + iota::event::emit(CoffeePurchased {}) + } + + /// Claim a free coffee from the shop. Emitted event is tracked by the real + /// coffee shop and the customer gets a free coffee after 4 purchases. The + /// `COFFEE` tokens are spent. + public fun claim_free(app: &mut CoffeeShop, points: Token, ctx: &mut TxContext) { + // Check if the customer has enough `COFFEE` points to claim a free one. + assert!(token::value(&points) == 4, EIncorrectAmount); + + // While you could use `burn`, spend illustrates another way of doing this + let request = token::spend(points, ctx); + token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx); + iota::event::emit(CoffeePurchased {}) + } + + /// you will allow transfer of `COFFEE` points to other customers but you charge 1 + /// `COFFEE` point for the transfer. + public fun transfer( + app: &mut CoffeeShop, + mut points: Token, + recipient: address, + ctx: &mut TxContext + ) { + assert!(token::value(&points) > 1, ENotEnoughPoints); + let commission = token::split(&mut points, 1, ctx); + let request = token::transfer(points, recipient, ctx); + + token::confirm_with_treasury_cap(&mut app.coffee_points, request, ctx); + token::burn(&mut app.coffee_points, commission); + } +} \ No newline at end of file From 07a5ef3e41e849e181c945a7a23067d043e20764 Mon Sep 17 00:00:00 2001 From: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:25:38 +0100 Subject: [PATCH 62/62] refactor(iota-types): remove iotafrens mentions (#3707) --- crates/iota-types/tests/serde_tests.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/iota-types/tests/serde_tests.rs b/crates/iota-types/tests/serde_tests.rs index 1c5e94b8ef0..6445ca6bac2 100644 --- a/crates/iota-types/tests/serde_tests.rs +++ b/crates/iota-types/tests/serde_tests.rs @@ -12,7 +12,7 @@ use serde_with::serde_as; #[test] fn test_struct_tag_serde() { - let tag = parse_iota_struct_tag("0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::iotafrens::IotaFren<0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::capy::Capy>").unwrap(); + let tag = parse_iota_struct_tag("0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::mymodule::MyStruct<0x7f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::othermodule::OtherStruct>").unwrap(); #[serde_as] #[derive(Serialize)] struct TestStructTag(#[serde_as(as = "IotaStructTag")] StructTag); @@ -23,7 +23,7 @@ fn test_struct_tag_serde() { }; assert_eq!( json, - "0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::iotafrens::IotaFren<0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::capy::Capy>" + "0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::mymodule::MyStruct<0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::othermodule::OtherStruct>" ); let tag2 = parse_iota_struct_tag(&json).unwrap();