Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:iotaledger/iota into feat/gascos…
Browse files Browse the repository at this point in the history
…tsummaryburned
  • Loading branch information
muXxer committed Nov 8, 2024
2 parents f169075 + 1a2e8e4 commit e6ae59b
Show file tree
Hide file tree
Showing 527 changed files with 7,748 additions and 23,762 deletions.
4 changes: 2 additions & 2 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ failure-output = "immediate"
status-level = "skip"
# Retry failing tests in order to not block builds on flaky tests
retries = 1
# Timeout tests after 4 minutes
slow-timeout = { period = "60s", terminate-after = 4 }
# Timeout tests after 5 minutes
slow-timeout = { period = "60s", terminate-after = 5 }

[profile.simtestnightly]
# Print out output for failing tests as soon as they fail, and also at the end
Expand Down
2 changes: 2 additions & 0 deletions Cargo.lock

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

5 changes: 4 additions & 1 deletion apps/core/src/utils/isAssetTransferable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
import { IotaObjectData } from '@iota/iota-sdk/client';

export const isAssetTransferable = (obj: IotaObjectData | null | undefined): boolean =>
!!obj && obj.content?.dataType === 'moveObject' && obj.content.hasPublicTransfer;
// TODO: Either the type abilities will be added to 'IotaParsedData' and
// we need to check if the object has the 'store' ability or there will be a new endpoint
// that returns the "transferable" status of a MoveType.
!!obj && obj.content?.dataType === 'moveObject'; // && obj.content.hasPublicTransfer;
7 changes: 2 additions & 5 deletions apps/wallet/src/ui/app/pages/home/nft-details/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Collapsible } from '_app/shared/collapse';
import { ExplorerLink, ExplorerLinkType, Loading, NFTDisplayCard, PageTemplate } from '_components';
import { useNFTBasicData, useOwnedNFT } from '_hooks';
import { useUnlockedGuard } from '_src/ui/app/hooks/useUnlockedGuard';
import { useGetKioskContents, useGetNFTMeta } from '@iota/core';
import { isAssetTransferable, useGetKioskContents, useGetNFTMeta } from '@iota/core';
import { formatAddress } from '@iota/iota-sdk/utils';
import cl from 'clsx';
import { Link, Navigate, useNavigate, useSearchParams } from 'react-router-dom';
Expand All @@ -24,10 +24,7 @@ function NFTDetailsPage() {
const nftId = searchParams.get('objectId');
const accountAddress = useActiveAddress();
const { data: objectData, isPending: isNftLoading } = useOwnedNFT(nftId || '', accountAddress);
const isTransferable =
!!objectData &&
objectData.content?.dataType === 'moveObject' &&
objectData.content?.hasPublicTransfer;
const isTransferable = isAssetTransferable(objectData);
const { nftFields, fileExtensionType, filePath } = useNFTBasicData(objectData);
const address = useActiveAddress();
const { data } = useGetKioskContents(address);
Expand Down
4 changes: 2 additions & 2 deletions crates/iota-adapter-transactional-tests/tests/call/simple.exp
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ task 1, lines 7-26:
//# publish
created: object(1,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5570800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5563200, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 28:
//# run Test::M1::create --args 0 @A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2302800, storage_rebate: 988000, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2287600, storage_rebate: 980400, non_refundable_storage_fee: 0

task 3, line 30:
//# view-object 2,0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ task 1, lines 10-52:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 7516400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 7508800, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 54:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 56:
//# view-object 2,0
Expand All @@ -31,13 +31,13 @@ task 4, line 58:
//# run test::m::add --sender A --args object(2,0) 1
created: object(4,0), object(4,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 5, line 60:
//# run test::m::remove --sender A --args object(2,0) 1
mutated: object(0,0), object(2,0)
deleted: object(4,0), object(4,1)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 5859600, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 5829200, non_refundable_storage_fee: 0

task 6, lines 62-66:
//# view-object 2,0
Expand All @@ -55,7 +55,7 @@ task 7, line 68:
//# run test::m::mint --sender A
created: object(7,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 988000, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 980400, non_refundable_storage_fee: 0

task 8, line 70:
//# view-object 7,0
Expand All @@ -73,12 +73,12 @@ task 9, line 72:
//# run test::m::add --sender A --args object(7,0) 1
created: object(9,0), object(9,1)
mutated: object(0,0), object(7,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 10, line 74:
//# run test::m::remove_and_add --sender A --args object(7,0) 1
mutated: object(0,0), object(7,0), object(9,0), object(9,1)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 5859600, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 5829200, non_refundable_storage_fee: 0

task 11, lines 76-80:
//# view-object 7,0
Expand All @@ -96,7 +96,7 @@ task 12, line 82:
//# run test::m::mint --sender A
created: object(12,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 988000, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 980400, non_refundable_storage_fee: 0

task 13, line 84:
//# view-object 12,0
Expand All @@ -114,14 +114,14 @@ task 14, line 86:
//# run test::m::add --sender A --args object(12,0) 1
created: object(14,0), object(14,1)
mutated: object(0,0), object(12,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 15, line 88:
//# run test::m::remove_and_wrap --sender A --args object(12,0) 1
created: object(15,0)
mutated: object(0,0), object(12,0), object(14,0)
wrapped: object(14,1)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 6102800, storage_rebate: 5859600, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 6072400, storage_rebate: 5829200, non_refundable_storage_fee: 0

task 16, line 90:
//# view-object 12,0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ task 1, lines 10-38:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 6513200, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 6505600, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 40:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 42:
//# run test::m::add --sender A --args object(2,0) 0
created: object(3,0), object(3,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 4, line 44:
//# view-object 2,0
Expand All @@ -38,4 +38,4 @@ task 5, line 46:
created: object(5,0)
mutated: object(0,0)
wrapped: object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2439600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2424400, storage_rebate: 2181200, non_refundable_storage_fee: 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ task 1, lines 10-32:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 6102800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 6095200, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 34:
//# run test::m::test_wrap --sender A
created: object(2,0), object(2,1), object(2,2)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 6102800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 6072400, storage_rebate: 0, non_refundable_storage_fee: 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ task 1, lines 10-33:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 6026800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 6019200, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 35:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 37:
//# run test::m::add --sender A --args object(2,0) 0
created: object(3,0), object(3,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 4, line 39:
//# view-object 2,0
Expand All @@ -37,4 +37,4 @@ task 5, line 41:
//# run test::m::delete --sender A --args object(2,0)
mutated: object(0,0)
deleted: object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 988000, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 980400, storage_rebate: 2181200, non_refundable_storage_fee: 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ task 1, lines 10-58:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 7987600, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 7980000, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 59:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 61:
//# run test::m::add --sender A --args object(2,0) 0
created: object(3,0), object(3,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 4, line 63:
//# view-object 2,0
Expand All @@ -37,10 +37,10 @@ task 5, line 65:
//# run test::m::remove --sender A --args object(2,0) 0
mutated: object(0,0), object(2,0)
deleted: object(3,0), object(3,1)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 5859600, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 5829200, non_refundable_storage_fee: 0

task 6, line 67:
//# run test::m::delete --sender A --args object(2,0)
mutated: object(0,0)
deleted: object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 988000, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 980400, storage_rebate: 2181200, non_refundable_storage_fee: 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ task 1, lines 11-70:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 8382800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 8375200, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 72:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 74:
//# run test::m::add --sender A --args object(2,0) 0
created: object(3,0), object(3,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 4, line 76:
//# view-object 2,0
Expand All @@ -37,4 +37,4 @@ task 5, line 78:
//# run test::m::remove_and_delete --sender A --args object(2,0) 0
mutated: object(0,0)
deleted: object(2,0), object(3,0), object(3,1)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 988000, storage_rebate: 5859600, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 980400, storage_rebate: 5829200, non_refundable_storage_fee: 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ task 1, lines 10-62:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 8458800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 8451200, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 64:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 66:
//# run test::m::add --sender A --args object(2,0) 0
created: object(3,0), object(3,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 4, line 68:
//# view-object 2,0
Expand All @@ -36,4 +36,4 @@ Contents: test::m::S {
task 5, line 70:
//# run test::m::freeze_object --sender A --args object(2,0)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 2181200, non_refundable_storage_fee: 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ task 1, lines 10-62:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 8458800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 8451200, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 64:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 66:
//# run test::m::add --sender A --args object(2,0) 0
created: object(3,0), object(3,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 4, line 68:
//# view-object 2,0
Expand All @@ -37,9 +37,9 @@ task 5, line 70:
//# run test::m::remove --sender A --args object(2,0) 0
mutated: object(0,0), object(2,0)
deleted: object(3,0), object(3,1)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 5859600, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 5829200, non_refundable_storage_fee: 0

task 6, line 72:
//# run test::m::freeze_object --sender A --args object(2,0)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 2181200, non_refundable_storage_fee: 0
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ task 1, lines 11-65:
//# publish
created: object(1,0)
mutated: object(0,2)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 8610800, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 8603200, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 67:
//# run test::m::mint --sender A
created: object(2,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 0, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 0, non_refundable_storage_fee: 0

task 3, line 69:
//# run test::m::add --sender A --args object(2,0) 0
created: object(3,0), object(3,1)
mutated: object(0,0), object(2,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5859600, storage_rebate: 2196400, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 5829200, storage_rebate: 2181200, non_refundable_storage_fee: 0

task 4, line 71:
//# view-object 2,0
Expand All @@ -37,4 +37,4 @@ task 5, line 73:
//# run test::m::remove_and_freeze --sender A --args object(2,0) 0
mutated: object(0,0), object(2,0)
deleted: object(3,0), object(3,1)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2196400, storage_rebate: 5859600, non_refundable_storage_fee: 0
gas summary: computation_cost: 1000000, storage_cost: 2181200, storage_rebate: 5829200, non_refundable_storage_fee: 0
Loading

0 comments on commit e6ae59b

Please sign in to comment.