Revert all recent $ renames (#5429)
* Revert "[CI Skip] bump/beta 9.11.4-6-x" This reverts commit7ee4f7aaf8. * Revert "Rename Code .registry to .$registry (#5428)" This reverts commitdd6826fadd. * Revert "[CI Skip] bump/beta 9.11.4-5-x" This reverts commitabc68bf2e2. * Revert "Convert encodedLength to $encodedLength (#5426)" This reverts commitccab89304b. * Revert "[CI Skip] bump/beta 9.11.4-4-x" This reverts commit044465eee4. * Revert "Rename inspect() to inspectU8a() (#5425)" This reverts commit42af205546. * Revert "[CI Skip] bump/beta 9.11.4-3-x" This reverts commit545ad50097. * Revert "Move .isEmpty to $isEmpty (#5424)" This reverts commit6f19084a4d. * Revert "[CI Skip] bump/beta 9.11.4-2-x" This reverts commit4688291ecf. * Revert "Warn on deprecated getter usage (#5423)" This reverts commitda1cf9d64e. * Revert "[CI Skip] bump/beta 9.11.4-1-x" This reverts commit96a3ef51f0. * Revert "Revert "[CI Skip] bump/beta 9.11.4-1-x"" This reverts commit 2eca0730a630d587878f12c141e21ea631dcdd19. * Revert "Revert "[CI Skip] bump/beta 9.11.4-2-x"" This reverts commit 66284b40692071aa03a1064997c9402fc0b0987c. * Revert "Revert "[CI Skip] bump/beta 9.11.4-3-x"" This reverts commit 9b820eaefccdb7b51d893000e5480d11e5195e22. * Revert "Revert "[CI Skip] bump/beta 9.11.4-4-x"" This reverts commit cb5149adf98a5eefd8da61b8793707f85deb7c09. * Revert "Revert "[CI Skip] bump/beta 9.11.4-5-x"" This reverts commit 489a64439860fefba163695ec36b319dcb1eeddc. * Revert "Revert "[CI Skip] bump/beta 9.11.4-6-x"" This reverts commit 34a0fd4e2784a1b40ea8e06534d1f39328250e7a. * Adjust linebreaks * Adjust isStorageFallback naming * Fix build
This commit is contained in:
@@ -116,7 +116,7 @@ function querySystemAccount (api: DeriveApi, accountId: AccountId): Observable<R
|
||||
|
||||
const nonce = (infoOrTuple as AccountInfo).nonce || (infoOrTuple as [Index, AccountData])[0];
|
||||
|
||||
if (!data || data.$isEmpty) {
|
||||
if (!data || data.isEmpty) {
|
||||
return [
|
||||
nonce,
|
||||
[[zeroBalance(api), zeroBalance(api), zeroBalance(api), zeroBalance(api)]]
|
||||
|
||||
@@ -38,7 +38,7 @@ export function getBlock (instanceId: string, api: DeriveApi): (hash: Uint8Array
|
||||
])
|
||||
),
|
||||
map(([signedBlock, events, [, validators, author]]) =>
|
||||
createSignedBlockExtended(events.$registry, signedBlock, events, validators, author)
|
||||
createSignedBlockExtended(events.registry, signedBlock, events, validators, author)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
@@ -35,7 +35,7 @@ export function getHeader (instanceId: string, api: DeriveApi): (blockHash: Uint
|
||||
getAuthorDetails(header, queryAt)
|
||||
),
|
||||
map(([header, validators, author]) =>
|
||||
createHeaderExtended((validators || header).$registry, header, validators, author)
|
||||
createHeaderExtended((validators || header).registry, header, validators, author)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
@@ -17,7 +17,7 @@ export function subscribeFinalizedBlocks (instanceId: string, api: DeriveApi): (
|
||||
return memo(instanceId, (): Observable<SignedBlockExtended> =>
|
||||
api.derive.chain.subscribeFinalizedHeads().pipe(
|
||||
switchMap((header) =>
|
||||
api.derive.chain.getBlock(header.$createdAtHash || header.hash)
|
||||
api.derive.chain.getBlock(header.createdAtHash || header.hash)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
@@ -41,7 +41,7 @@ export function subscribeFinalizedHeads (instanceId: string, api: DeriveApi): ()
|
||||
const endHash = prevHash;
|
||||
const startHash = header.parentHash;
|
||||
|
||||
prevHash = header.$createdAtHash = header.hash;
|
||||
prevHash = header.createdAtHash = header.hash;
|
||||
|
||||
return endHash === null || startHash.eq(endHash)
|
||||
? of(header)
|
||||
|
||||
@@ -17,7 +17,7 @@ export function subscribeNewBlocks (instanceId: string, api: DeriveApi): () => O
|
||||
return memo(instanceId, (): Observable<SignedBlockExtended> =>
|
||||
api.derive.chain.subscribeNewHeads().pipe(
|
||||
switchMap((header) =>
|
||||
api.derive.chain.getBlock(header.$createdAtHash || header.hash)
|
||||
api.derive.chain.getBlock(header.createdAtHash || header.hash)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
@@ -37,9 +37,9 @@ export function subscribeNewHeads (instanceId: string, api: DeriveApi): () => Ob
|
||||
getAuthorDetails(header, queryAt)
|
||||
),
|
||||
map(([header, validators, author]): HeaderExtended => {
|
||||
header.$createdAtHash = header.hash;
|
||||
header.createdAtHash = header.hash;
|
||||
|
||||
return createHeaderExtended(header.$registry, header, validators, author);
|
||||
return createHeaderExtended(header.registry, header, validators, author);
|
||||
})
|
||||
)
|
||||
);
|
||||
|
||||
@@ -33,7 +33,7 @@ function _getUpdates (api: DeriveApi, paraId: string | number | BN): Observable<
|
||||
added = added.concat(...changes.added);
|
||||
removed = removed.concat(...changes.removed);
|
||||
|
||||
return of({ added, addedDelta: changes.added, blockHash: events.$createdAtHash?.toHex() || '-', removed, removedDelta: changes.removed });
|
||||
return of({ added, addedDelta: changes.added, blockHash: events.createdAtHash?.toHex() || '-', removed, removedDelta: changes.removed });
|
||||
}
|
||||
|
||||
return EMPTY;
|
||||
@@ -52,7 +52,7 @@ function _eventTriggerAll (api: DeriveApi, paraId: string | number | BN): Observ
|
||||
);
|
||||
|
||||
return items.length
|
||||
? of(events.$createdAtHash?.toHex() || '-')
|
||||
? of(events.createdAtHash?.toHex() || '-')
|
||||
: EMPTY;
|
||||
}),
|
||||
startWith('-')
|
||||
|
||||
@@ -29,5 +29,5 @@ export function extractContributed (paraId: string | number | BN, events: Vec<Fr
|
||||
}
|
||||
|
||||
return result;
|
||||
}, { added, blockHash: events.$createdAtHash?.toHex() || '-', removed });
|
||||
}, { added, blockHash: events.createdAtHash?.toHex() || '-', removed });
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ function isNewDepositors (depositors: ITuple<[Vec<AccountId>, Balance]> | ITuple
|
||||
function parse ([proposals, images, optDepositors]: Result): DeriveProposal[] {
|
||||
return proposals
|
||||
.filter(([, , proposer], index): boolean =>
|
||||
!!(optDepositors[index]?.isSome) && !proposer.$isEmpty
|
||||
!!(optDepositors[index]?.isSome) && !proposer.isEmpty
|
||||
)
|
||||
.map(([index, hash, proposer], proposalIndex): DeriveProposal => {
|
||||
const depositors = optDepositors[proposalIndex].unwrap();
|
||||
|
||||
@@ -19,7 +19,7 @@ function mapResult ([result, validators, heartbeats, numBlocks]: [DeriveHeartbea
|
||||
validators.forEach((validator, index): void => {
|
||||
const validatorId = validator.toString();
|
||||
const blockCount = numBlocks[index];
|
||||
const hasMessage = !heartbeats[index].$isEmpty;
|
||||
const hasMessage = !heartbeats[index].isEmpty;
|
||||
const prev = result[validatorId];
|
||||
|
||||
if (!prev || prev.hasMessage !== hasMessage || !prev.blockCount.eq(blockCount)) {
|
||||
|
||||
@@ -37,7 +37,7 @@ function signingHeader (api: DeriveApi): Observable<Header> {
|
||||
switchMap((header) =>
|
||||
// check for chains at genesis (until block 1 is produced, e.g. 6s), since
|
||||
// we do need to allow transactions at chain start (also dev/seal chains)
|
||||
header.parentHash.$isEmpty
|
||||
header.parentHash.isEmpty
|
||||
? of(header)
|
||||
// in the case of the current block, we use the parent to minimize the
|
||||
// impact of forks on the system, but not completely remove it
|
||||
|
||||
@@ -18,7 +18,7 @@ export function createHeaderExtended (registry: Registry, header?: Header, valid
|
||||
super(registry, header);
|
||||
|
||||
this.#author = author || extractAuthor(this.digest, validators || []);
|
||||
this.$createdAtHash = header?.$createdAtHash;
|
||||
this.createdAtHash = header?.createdAtHash;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -46,7 +46,7 @@ export function createSignedBlockExtended (registry: Registry, block?: SignedBlo
|
||||
this.#author = author || extractAuthor(this.block.header.digest, validators || []);
|
||||
this.#events = events || ([] as EventRecord[]);
|
||||
this.#extrinsics = mapExtrinsics(this.block.extrinsics, this.#events);
|
||||
this.$createdAtHash = block?.$createdAtHash;
|
||||
this.createdAtHash = block?.createdAtHash;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user