Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2098 remove jakarta condition in on chain view #2130

Closed
Closed
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
47cf160
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Aug 8, 2022
53bf5c5
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Aug 11, 2022
eddeb1d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Aug 23, 2022
ac9bd70
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Sep 13, 2022
ca9577d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Sep 28, 2022
8c1643d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 4, 2022
d34128b
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 5, 2022
ad53532
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 20, 2022
1d175f5
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 25, 2022
b1414ef
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 27, 2022
c029847
feat: support new types for new operations UpdateConsensusKey and Dra…
hui-an-yang Oct 31, 2022
33489db
test: update_consensus_key unit test added for limanet
hui-an-yang Nov 4, 2022
029efa1
feat: support new operation UpdateConsensusKey for Lima
hui-an-yang Nov 5, 2022
2992fcf
feat: support new operation updateConsensusKey in local-forger for Lima
hui-an-yang Nov 7, 2022
edd3f63
revert: removed unnecesorry change of updateConsensusKey in rpc-batch…
hui-an-yang Nov 7, 2022
e0126e5
revert: changes of update_consensus_key in RpcContractProvider and RP…
hui-an-yang Nov 8, 2022
984e3a5
feat: support new operation drainDelegate for Lima
hui-an-yang Nov 8, 2022
1c0a203
Merge branch 'lima' of github.com:ecadlabs/taquito into 2065-local-fo…
hui-an-yang Nov 8, 2022
db4db3d
Merge branch 'lima' of github.com:ecadlabs/taquito into 2072-support-…
hui-an-yang Nov 16, 2022
b2f4a98
feat: support new encoding for ticket & ticket depreacted in lima wit…
hui-an-yang Nov 17, 2022
3f0723c
Merge branch 'lima' of github.com:ecadlabs/taquito into 2072-support-…
hui-an-yang Nov 17, 2022
501b4b2
Configure NPM Workspaces (#2088)
danielelisi Nov 17, 2022
2e9ceba
build(deps): bump loader-utils from 1.4.1 to 1.4.2
dependabot[bot] Nov 17, 2022
4070a28
fix: added ASSERT_SOME in ticketCode and fixed 2 integration tests in…
hui-an-yang Nov 17, 2022
d978b87
Merge branch 'lima' of github.com:ecadlabs/taquito into 2065-local-fo…
hui-an-yang Nov 17, 2022
64903a8
fixs merge conflicts
hui-an-yang Nov 17, 2022
6628b93
fix: fixs merge conflicts
hui-an-yang Nov 17, 2022
5b73497
fix: replaced ASSERT_SOME with its expansion in ticketCode
hui-an-yang Nov 18, 2022
dbc38dc
fix: resolving merge conflicts with lima
hui-an-yang Nov 18, 2022
9c71ca0
Merge branch '2072-support-new-encoding-for-ticket-in-lima' of github…
hui-an-yang Nov 18, 2022
f3761d5
test: added local-forgin integration tests for new operations
hui-an-yang Nov 18, 2022
c7123ce
feat: removed Jakarta conditions in on chain view related files
hui-an-yang Nov 19, 2022
7965eb0
Merge pull request #2129 from ecadlabs/dependabot/npm_and_yarn/loader…
roxaneletourneau Nov 21, 2022
cd93b5d
fix: resolved merge conflicts from master
hui-an-yang Nov 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: support new types for new operations UpdateConsensusKey and Dra…
…inDelegate in Lima

re #2066
hui-an-yang committed Oct 31, 2022
commit c0298478f304a7d053db3596d553bc31f9fd8af0
2 changes: 2 additions & 0 deletions packages/taquito-rpc/src/opkind.ts
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ export enum OpKind {
TX_ROLLUP_DISPATCH_TICKETS = 'tx_rollup_dispatch_tickets',
TRANSFER_TICKET = 'transfer_ticket',
INCREASE_PAID_STORAGE = 'increase_paid_storage',
UPDATE_CONSENSUS_KEY = 'update_consensus_key',
DRAIN_DELEGATE = 'drain_delegate',
VDF_REVELATION = 'vdf_revelation',
EVENT = 'event',
}
58 changes: 58 additions & 0 deletions packages/taquito-rpc/src/types.ts
Original file line number Diff line number Diff line change
@@ -438,6 +438,23 @@ export interface OperationContentsTransferTicket {
entrypoint: string;
}

export interface OperationContentsUpdateConsensusKey {
kind: OpKind.UPDATE_CONSENSUS_KEY;
source: string;
fee: string;
counter: string;
gas_limit: string;
storage_limit: string;
pk: string;
}

export interface OperationContentsDrainDelegate {
kind: OpKind.DRAIN_DELEGATE;
consensus_key: string;
delegate: string;
destination: string;
}

export interface OperationContentsIncreasePaidStorage {
kind: OpKind.INCREASE_PAID_STORAGE;
source: string;
@@ -476,6 +493,8 @@ export type OperationContents =
| OperationContentsTxRollupRemoveCommitment
| OperationContentsTxRollupRejection
| OperationContentsTransferTicket
| OperationContentsUpdateConsensusKey
| OperationContentsDrainDelegate
| OperationContentsIncreasePaidStorage;

export interface OperationContentsAndResultMetadataExtended {
@@ -585,6 +604,17 @@ export interface OperationContentsAndResultMetadataIncreasePaidStorage {
internal_operation_results?: InternalOperationResult[];
}

export interface OperationContentsAndResultMetadataUpdateConsensusKey {
balance_updates?: OperationMetadataBalanceUpdates[];
operation_result: OperationResultUpdateConsensusKey;
internal_operation_results?: InternalOperationResult[];
}

export interface OperationContentsAndResultMetadataDrainDelegate {
balance_updates?: OperationMetadataBalanceUpdates[];
allocated_destination_contract?: boolean;
}

export interface OperationContentsAndResultEndorsement {
kind: OpKind.ENDORSEMENT;
block_payload_hash?: string;
@@ -838,6 +868,25 @@ export interface OperationContentsAndResultTxRollupDispatchTickets {
metadata: OperationContentsAndResultMetadataTxRollupDispatchTickets;
}

export interface OperationContentsAndResultUpdateConsensusKey {
kind: OpKind.UPDATE_CONSENSUS_KEY;
source: string;
fee: string;
counter: string;
gas_limit: string;
storage_limit: string;
pk: string;
metadata: OperationContentsAndResultMetadataUpdateConsensusKey;
}

export interface OperationContentsAndResultDrainDelegate {
kind: OpKind.DRAIN_DELEGATE;
consensus_key: string;
delegate: string;
destination: string;
metadata: OperationContentsAndResultMetadataDrainDelegate;
}

export interface OperationContentsAndResultIncreasePaidStorage {
kind: OpKind.INCREASE_PAID_STORAGE;
source: string;
@@ -883,6 +932,8 @@ export type OperationContentsAndResult =
| OperationContentsAndResultTxRollupRejection
| OperationContentsAndResultTransferTicket
| OperationContentsAndResultIncreasePaidStorage
| OperationContentsAndResultUpdateConsensusKey
| OperationContentsAndResultDrainDelegate
| OperationContentsAndResultVdfRevelation;

export enum OPERATION_METADATA {
@@ -1219,6 +1270,13 @@ export interface OperationResultIncreasePaidStorage {
errors?: TezosGenericOperationError[];
}

export interface OperationResultUpdateConsensusKey {
status: OperationResultStatusEnum;
consumed_gas?: string;
consumed_milligas?: string;
errors?: TezosGenericOperationError[];
}

export interface OperationResultDelegation {
status: OperationResultStatusEnum;
consumed_gas?: string;