Skip to content

Commit c78bb61

Browse files
volivavoliva
authored
Merge pull request #54 from polkadot-api/ink-gas-weight
fix(revive): Support chains with renamed `gas_limit` to `weight_limit`
2 parents 56b1ec4 + 51c0e0d commit c78bb61

File tree

32 files changed

+502
-413
lines changed

32 files changed

+502
-413
lines changed

‎examples/governance/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@polkadot-api/descriptors": "file:.papi/descriptors",
1313
"@polkadot-api/sdk-governance": "workspace:*",
14-
"polkadot-api": "^1.22.0",
14+
"polkadot-api": "^1.23.1",
1515
"rxjs": "7.8.2"
1616
}
1717
}

‎examples/ink-playground/.papi/contracts/ballot.json‎

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -10,73 +10,6 @@
1010
"stateMutability": "nonpayable",
1111
"type": "constructor"
1212
},
13-
{
14-
"inputs": [
15-
{
16-
"internalType": "uint256",
17-
"name": "available",
18-
"type": "uint256"
19-
},
20-
{
21-
"internalType": "uint256",
22-
"name": "required",
23-
"type": "uint256"
24-
}
25-
],
26-
"name": "InsufficientBalance",
27-
"type": "error"
28-
},
29-
{
30-
"anonymous": true,
31-
"inputs": [
32-
{
33-
"indexed": true,
34-
"internalType": "address",
35-
"name": "voter",
36-
"type": "address"
37-
}
38-
],
39-
"name": "AnonRightGiven",
40-
"type": "event"
41-
},
42-
{
43-
"anonymous": true,
44-
"inputs": [
45-
{
46-
"indexed": false,
47-
"internalType": "address",
48-
"name": "voter",
49-
"type": "address"
50-
},
51-
{
52-
"indexed": false,
53-
"internalType": "uint256",
54-
"name": "value",
55-
"type": "uint256"
56-
}
57-
],
58-
"name": "AnonRightGiven2",
59-
"type": "event"
60-
},
61-
{
62-
"anonymous": false,
63-
"inputs": [
64-
{
65-
"indexed": true,
66-
"internalType": "address",
67-
"name": "voter",
68-
"type": "address"
69-
},
70-
{
71-
"indexed": false,
72-
"internalType": "uint256",
73-
"name": "value",
74-
"type": "uint256"
75-
}
76-
],
77-
"name": "RightGiven",
78-
"type": "event"
79-
},
8013
{
8114
"inputs": [],
8215
"name": "chairperson",

‎examples/ink-playground/contracts/ballot_sol/3_Ballot.sol‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ contract Ballot {
4343
}
4444
}
4545

46-
error InsufficientBalance(uint available, uint required);
47-
event RightGiven(address indexed voter, uint value);
48-
event AnonRightGiven(address indexed voter) anonymous;
49-
event AnonRightGiven2(address voter, uint value) anonymous;
50-
5146
/**
5247
* @dev Give 'voter' the right to vote on this ballot. May only be called by 'chairperson'.
5348
* @param voter address of voter
@@ -60,11 +55,6 @@ contract Ballot {
6055
require(!voters[voter].voted, "The voter already voted.");
6156
require(voters[voter].weight == 0);
6257
voters[voter].weight = 1;
63-
64-
revert InsufficientBalance({available: 100, required: 400});
65-
// emit RightGiven(voter, 5);
66-
// emit AnonRightGiven(voter);
67-
// emit AnonRightGiven2(voter, 5);
6858
}
6959

7060
/**

‎examples/ink-playground/contracts/ballot_sol/3_Ballot_sol_Ballot.abi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"inputs":[{"internalType":"bytes32[]","name":"proposalNames","type":"bytes32[]"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"uint256","name":"available","type":"uint256"},{"internalType":"uint256","name":"required","type":"uint256"}],"name":"InsufficientBalance","type":"error"},{"anonymous":true,"inputs":[{"indexed":true,"internalType":"address","name":"voter","type":"address"}],"name":"AnonRightGiven","type":"event"},{"anonymous":true,"inputs":[{"indexed":false,"internalType":"address","name":"voter","type":"address"},{"indexed":false,"internalType":"uint256","name":"value","type":"uint256"}],"name":"AnonRightGiven2","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"voter","type":"address"},{"indexed":false,"internalType":"uint256","name":"value","type":"uint256"}],"name":"RightGiven","type":"event"},{"inputs":[],"name":"chairperson","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"delegate","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"function (bool) pure external","name":"someFn","type":"function"}],"name":"fn_as_arg","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"voter","type":"address"}],"name":"giveRightToVote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int48","name":"value","type":"int48"}],"name":"number","outputs":[{"internalType":"int48","name":"_value","type":"int48"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"int48","name":"numeric","type":"int48"},{"internalType":"int56","name":"big","type":"int56"}],"name":"numbers","outputs":[{"internalType":"int48","name":"_numeric","type":"int48"},{"internalType":"int56","name":"_big","type":"int56"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"proposals","outputs":[{"internalType":"bytes32","name":"name","type":"bytes32"},{"internalType":"uint256","name":"voteCount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_calldata","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_memory","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"proposal","type":"uint256"}],"name":"vote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"voters","outputs":[{"internalType":"uint256","name":"weight","type":"uint256"},{"internalType":"bool","name":"voted","type":"bool"},{"internalType":"address","name":"delegate","type":"address"},{"internalType":"uint256","name":"vote","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winnerName","outputs":[{"internalType":"bytes32","name":"winnerName_","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winningProposal","outputs":[{"internalType":"uint256","name":"winningProposal_","type":"uint256"}],"stateMutability":"view","type":"function"}]
1+
[{"inputs":[{"internalType":"bytes32[]","name":"proposalNames","type":"bytes32[]"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"chairperson","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"delegate","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"function (bool) pure external","name":"someFn","type":"function"}],"name":"fn_as_arg","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"voter","type":"address"}],"name":"giveRightToVote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int48","name":"value","type":"int48"}],"name":"number","outputs":[{"internalType":"int48","name":"_value","type":"int48"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"int48","name":"numeric","type":"int48"},{"internalType":"int56","name":"big","type":"int56"}],"name":"numbers","outputs":[{"internalType":"int48","name":"_numeric","type":"int48"},{"internalType":"int56","name":"_big","type":"int56"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"proposals","outputs":[{"internalType":"bytes32","name":"name","type":"bytes32"},{"internalType":"uint256","name":"voteCount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_calldata","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"string","name":"str","type":"string"}],"name":"str_fn_memory","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"proposal","type":"uint256"}],"name":"vote","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"voters","outputs":[{"internalType":"uint256","name":"weight","type":"uint256"},{"internalType":"bool","name":"voted","type":"bool"},{"internalType":"address","name":"delegate","type":"address"},{"internalType":"uint256","name":"vote","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winnerName","outputs":[{"internalType":"bytes32","name":"winnerName_","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"winningProposal","outputs":[{"internalType":"uint256","name":"winningProposal_","type":"uint256"}],"stateMutability":"view","type":"function"}]

‎examples/ink-playground/contracts/ballot_sol/3_Ballot_sol_Ballot.polkavm‎

-93 Bytes
Binary file not shown.

‎examples/ink-playground/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"dependencies": {
1212
"@polkadot-api/descriptors": "file:.papi/descriptors",
1313
"@polkadot-api/sdk-ink": "workspace:*",
14-
"@polkadot-labs/hdkd": "^0.0.25",
15-
"@polkadot-labs/hdkd-helpers": "^0.0.26",
16-
"polkadot-api": "^1.22.0",
14+
"@polkadot-labs/hdkd": "^0.0.26",
15+
"@polkadot-labs/hdkd-helpers": "^0.0.27",
16+
"polkadot-api": "^1.23.1",
1717
"rxjs": "7.8.2"
1818
}
1919
}

‎examples/ink-playground/src/util/address.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ export const ADDRESS = {
33
bob: "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
44
psp22: "13RUUKAVEUdafihJZdd6dppNHXpCeLGDFGB3goyzRugUBkrx",
55
flipper: "0x6f38a07b338aed6b7146df28ea2a4f8d2c420afc",
6-
ballot: "0x0149fa81394fe954cf518df4916b0f81865e06e9",
6+
ballot: "0xf2eb1d64d27105769772753cbf36766def13e947",
77
}

‎examples/remote-proxy/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"preview": "vite preview"
1111
},
1212
"devDependencies": {
13-
"@types/node": "^24.10.1",
13+
"@types/node": "^25.0.1",
1414
"ts-node": "^10.9.2",
1515
"typescript": "^5.9.3",
16-
"vite": "^7.2.4"
16+
"vite": "^7.2.7"
1717
},
1818
"dependencies": {
1919
"@polkadot-api/descriptors": "file:.papi/descriptors",
2020
"@polkadot-api/sdk-remote-proxy": "workspace:*",
21-
"polkadot-api": "1.22.0",
21+
"polkadot-api": "1.23.1",
2222
"rxjs": "^7.8.2"
2323
}
2424
}

‎examples/staking/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@polkadot-api/descriptors": "file:.papi/descriptors",
1313
"@polkadot-api/sdk-staking": "workspace:*",
14-
"polkadot-api": "^1.22.0",
14+
"polkadot-api": "^1.23.1",
1515
"rxjs": "7.8.2"
1616
}
1717
}

‎examples/statement-playground/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"dependencies": {
77
"@polkadot-api/sdk-statement": "workspace:*",
88
"@polkadot-api/substrate-bindings": "^0.16.5",
9-
"@polkadot-api/substrate-client": "^0.4.7",
9+
"@polkadot-api/substrate-client": "^0.5.0",
1010
"@polkadot-api/utils": "^0.2.0",
1111
"@polkadot-api/ws-provider": "^0.7.4",
12-
"@scure/sr25519": "^0.3.0"
12+
"@scure/sr25519": "^1.0.0"
1313
},
1414
"devDependencies": {
1515
"@types/bun": "latest"

0 commit comments

Comments
 (0)