-
Notifications
You must be signed in to change notification settings - Fork 76
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
Add v3 transactions additional fields #162
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1878,10 +1878,41 @@ | |
"description": "The hash of the declared class", | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"l1_gas": { | ||
"title": "L1 Gas", | ||
"description": "The max amount and max price per unit of L1 gas used in this tx", | ||
"$ref": "#/components/schemas/RESOURCE_LIMITS" | ||
"resource_bounds": { | ||
"title": "Resource bounds", | ||
"description": "resource bounds for the transaction execution", | ||
"$ref": "#/components/schemas/RESOURCE_BOUNDS_MAPPING" | ||
}, | ||
"tip": { | ||
"title": "Tip", | ||
"$ref": "#/components/schemas/FELT", | ||
"description": "the tip for the transaction" | ||
}, | ||
"paymaster_data": { | ||
"title": "Paymaster data", | ||
"type": "array", | ||
"items": { | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"description": "data needed to allow the paymaster to pay for the transaction in native tokens" | ||
}, | ||
"account_deployment_data": { | ||
"title": "Account deployment data", | ||
"type": "array", | ||
"items": { | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"description": "data needed to deploy the account contract from which this tx will be initiated" | ||
}, | ||
"nonce_data_availability_mode": { | ||
"title": "Nonce DA mode", | ||
"description": "The storage domain of the account's nonce (an account has a nonce per DA mode)", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
}, | ||
"fee_data_availability_mode": { | ||
"title": "Fee DA mode", | ||
"description": "The storage domain of the account's balance from which fee will be charged", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
} | ||
}, | ||
"required": [ | ||
|
@@ -1892,7 +1923,12 @@ | |
"signature", | ||
"nonce", | ||
"class_hash", | ||
"l1_gas" | ||
"resource_bounds", | ||
"tip", | ||
"paymaster_data", | ||
"account_deployment_data", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why is "account_deployment_data" relevant for declare? |
||
"nonce_data_availability_mode", | ||
"fee_data_availability_mode" | ||
] | ||
} | ||
] | ||
|
@@ -2107,10 +2143,41 @@ | |
"description": "The class to be declared", | ||
"$ref": "#/components/schemas/CONTRACT_CLASS" | ||
}, | ||
"l1_gas": { | ||
"title": "L1 Gas", | ||
"description": "The max amount and max price per unit of L1 gas used in this tx", | ||
"$ref": "#/components/schemas/RESOURCE_LIMITS" | ||
"resource_bounds": { | ||
"title": "Resource bounds", | ||
"description": "resource bounds for the transaction execution", | ||
"$ref": "#/components/schemas/RESOURCE_BOUNDS_MAPPING" | ||
}, | ||
"tip": { | ||
"title": "Tip", | ||
"$ref": "#/components/schemas/FELT", | ||
"description": "the tip for the transaction" | ||
}, | ||
"paymaster_data": { | ||
"title": "Paymaster data", | ||
"type": "array", | ||
"items": { | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"description": "data needed to allow the paymaster to pay for the transaction in native tokens" | ||
}, | ||
"account_deployment_data": { | ||
"title": "Account deployment data", | ||
"type": "array", | ||
"items": { | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"description": "data needed to deploy the account contract from which this tx will be initiated" | ||
}, | ||
"nonce_data_availability_mode": { | ||
"title": "Nonce DA mode", | ||
"description": "The storage domain of the account's nonce (an account has a nonce per DA mode)", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
}, | ||
"fee_data_availability_mode": { | ||
"title": "Fee DA mode", | ||
"description": "The storage domain of the account's balance from which fee will be charged", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
} | ||
}, | ||
"required": [ | ||
|
@@ -2121,7 +2188,12 @@ | |
"signature", | ||
"nonce", | ||
"contract_class", | ||
"l1_gas" | ||
"resource_bounds", | ||
"tip", | ||
"paymaster_data", | ||
"account_deployment_data", | ||
"nonce_data_availability_mode", | ||
"fee_data_availability_mode" | ||
] | ||
} | ||
] | ||
|
@@ -2249,10 +2321,33 @@ | |
"description": "The hash of the deployed contract's class", | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"l1_gas": { | ||
"title": "L1 Gas", | ||
"description": "The max amount and max price per unit of L1 gas used in this tx", | ||
"$ref": "#/components/schemas/RESOURCE_LIMITS" | ||
"resource_bounds": { | ||
"title": "Resource bounds", | ||
"description": "resource bounds for the transaction execution", | ||
"$ref": "#/components/schemas/RESOURCE_BOUNDS_MAPPING" | ||
}, | ||
"tip": { | ||
"title": "Tip", | ||
"$ref": "#/components/schemas/FELT", | ||
"description": "the tip for the transaction" | ||
}, | ||
"paymaster_data": { | ||
"title": "Paymaster data", | ||
"type": "array", | ||
"items": { | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"description": "data needed to allow the paymaster to pay for the transaction in native tokens" | ||
}, | ||
"nonce_data_availability_mode": { | ||
"title": "Nonce DA mode", | ||
"description": "The storage domain of the account's nonce (an account has a nonce per DA mode)", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
}, | ||
"fee_data_availability_mode": { | ||
"title": "Fee DA mode", | ||
"description": "The storage domain of the account's balance from which fee will be charged", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
} | ||
}, | ||
"required": [ | ||
|
@@ -2263,7 +2358,11 @@ | |
"contract_address_salt", | ||
"constructor_calldata", | ||
"class_hash", | ||
"l1_gas" | ||
"resource_bounds", | ||
"tip", | ||
"paymaster_data", | ||
"nonce_data_availability_mode", | ||
"fee_data_availability_mode" | ||
] | ||
}, | ||
"DEPLOY_TXN": { | ||
|
@@ -2475,10 +2574,41 @@ | |
"title": "Nonce", | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"l1_gas": { | ||
"title": "L1 Gas", | ||
"description": "The max amount and max price per unit of L1 gas used in this tx", | ||
"$ref": "#/components/schemas/RESOURCE_LIMITS" | ||
"resource_bounds": { | ||
"title": "Resource bounds", | ||
"description": "resource bounds for the transaction execution", | ||
"$ref": "#/components/schemas/RESOURCE_BOUNDS_MAPPING" | ||
}, | ||
"tip": { | ||
"title": "Tip", | ||
"$ref": "#/components/schemas/FELT", | ||
"description": "the tip for the transaction" | ||
}, | ||
"paymaster_data": { | ||
"title": "Paymaster data", | ||
"type": "array", | ||
"items": { | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"description": "data needed to allow the paymaster to pay for the transaction in native tokens" | ||
}, | ||
"account_deployment_data": { | ||
"title": "Account deployment data", | ||
"type": "array", | ||
"items": { | ||
"$ref": "#/components/schemas/FELT" | ||
}, | ||
"description": "data needed to deploy the account contract from which this tx will be initiated" | ||
}, | ||
"nonce_data_availability_mode": { | ||
"title": "Nonce DA mode", | ||
"description": "The storage domain of the account's nonce (an account has a nonce per DA mode)", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
}, | ||
"fee_data_availability_mode": { | ||
"title": "Fee DA mode", | ||
"description": "The storage domain of the account's balance from which fee will be charged", | ||
"$ref": "#/components/schemas/DA_MODE" | ||
} | ||
}, | ||
"required": [ | ||
|
@@ -2488,7 +2618,12 @@ | |
"version", | ||
"signature", | ||
"nonce", | ||
"l1_gas" | ||
"resource_bounds", | ||
"tip", | ||
"paymaster_data", | ||
"account_deployment_data", | ||
"nonce_data_availability_mode", | ||
"fee_data_availability_mode" | ||
] | ||
} | ||
] | ||
|
@@ -3538,7 +3673,26 @@ | |
"L2" | ||
] | ||
}, | ||
"RESOURCE_LIMITS": { | ||
"RESOURCE_BOUNDS_MAPPING": { | ||
"type": "object", | ||
"properties": { | ||
"l1_gas": { | ||
"title": "L1 Gas", | ||
"description": "The max amount and max price per unit of L1 gas used in this tx", | ||
"$ref": "#/components/schemas/RESOURCE_BOUNDS" | ||
}, | ||
"l2_gas": { | ||
"title": "L2 Gas", | ||
"description": "The max amount and max price per unit of L2 gas used in this tx", | ||
"$ref": "#/components/schemas/RESOURCE_BOUNDS" | ||
} | ||
}, | ||
"required": [ | ||
"l1_gas", | ||
"l2_gas" | ||
] | ||
}, | ||
"RESOURCE_BOUNDS": { | ||
"type": "object", | ||
"properties": { | ||
"max_amount": { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note the structure of l1_gas, l2_gas is different in the GW and FGW, would be nicer if they'd be the same:
"resource_bounds": {
"L1_GAS": {
"max_amount": "0x5",
"max_price_per_unit": "0x6"
},
"L2_GAS": {
"max_amount": "0x0",
"max_price_per_unit": "0x0"
}
},