Skip to content

Update contract' gas to Weight type #5324

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.

Sign up for GitHub

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

Merged
jacogr merged 13 commits into from
Nov 13, 2022
Merged

Update contract' gas to Weight type #5324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
70087b1
Update contract' gas to Weight type
jasl Nov 8, 2022
05093af
Make Contracts Runtime Calls support WeightV2
jasl Nov 9, 2022
78258e6
fix gasConsumed & gasConsumed type
jasl Nov 9, 2022
4b0bcb7
Regenerate contracts types
jasl Nov 9, 2022
7647400
Correct ContractCallOutcome
jasl Nov 9, 2022
4668785
`gasLimit` are optional
jasl Nov 10, 2022
1da7ffa
Apply suggestion
jasl Nov 10, 2022
13e3828
Add ContractCallRequestV1 and specify old rpc use that
jasl Nov 11, 2022
5c0e8e1
Add back getGas
jasl Nov 11, 2022
c9f605d
Port jg-ContractsApi-v2 (#5330)
jasl Nov 11, 2022
5401b8a
Run yarn build:metadata
jasl Nov 11, 2022
277b7d8
There is no 'ContractCallRequestV1', only 'ContractCallRequest'
jasl Nov 11, 2022
bcddda6
api.tx.contracts.call.meta no version field, _isOldWeight still work?
jasl Nov 11, 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
Regenerate contracts types
  • Loading branch information
@jasl
jasl committed Nov 11, 2022
commit 4b0bcb7c4d558b0c0bfbd5bfa5335ff3956fde7a
4 changes: 2 additions & 2 deletions packages/types/src/interfaces/contracts/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const runtime: DefinitionsCall = {
},
{
name: 'gasLimit',
type: 'u64'
type: 'Weight'
Copy link

@athei athei Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an option: https://github.com/paritytech/substrate/blob/78f8f708781da6fd340ef2a1fc288060a35295ad/frame/contracts/src/lib.rs#L1215

Copy link
Contributor Author

@jasl jasl Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to Option<Weight>

},
{
name: 'storageDepositLimit',
Expand Down Expand Up @@ -64,7 +64,7 @@ export const runtime: DefinitionsCall = {
},
{
name: 'gasLimit',
type: 'u64'
type: 'Weight'
Copy link

@athei athei Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an option: https://github.com/paritytech/substrate/blob/78f8f708781da6fd340ef2a1fc288060a35295ad/frame/contracts/src/lib.rs#L1226

Copy link
Contributor Author

@jasl jasl Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to Option<Weight>

},
{
name: 'storageDepositLimit',
Expand Down
10 changes: 5 additions & 5 deletions packages/types/src/interfaces/contracts/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ export interface ContractCallRequest extends Struct {
readonly origin: AccountId;
readonly dest: AccountId;
readonly value: Balance;
readonly gasLimit: Gas;
readonly gasLimit: Weight;
readonly storageDepositLimit: Option<Balance>;
readonly inputData: Bytes;
}

/** @name ContractExecResult */
export interface ContractExecResult extends Struct {
readonly gasConsumed: Gas;
readonly gasRequired: Gas;
readonly gasConsumed: Weight;
readonly gasRequired: Weight;
readonly storageDeposit: StorageDeposit;
readonly debugMessage: Text;
readonly result: ContractExecResultResult;
Expand Down Expand Up @@ -139,8 +139,8 @@ export interface ContractInfo extends Enum {

/** @name ContractInstantiateResult */
export interface ContractInstantiateResult extends Struct {
readonly gasConsumed: Gas;
readonly gasRequired: Gas;
readonly gasConsumed: Weight;
readonly gasRequired: Weight;
readonly storageDeposit: StorageDeposit;
readonly debugMessage: Text;
readonly result: InstantiateReturnValue;
Expand Down