Skip to content

Commit

Permalink
Merge pull request #58 from multiversx/multisig-audit-fixes
Browse files Browse the repository at this point in the history 
Multisig audit fixes
  • Loading branch information
@ccorcoveanu
ccorcoveanu authored Mar 18, 2024
2 parents d2677e9 + 6ee6ce2 commit 37d970c
Show file tree
Hide file tree
Showing 26 changed files with 682 additions and 183 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
uses: multiversx/mx-sc-actions/.github/workflows/[email protected]
with:
rust-toolchain: nightly-2023-12-11
vmtools-version: v1.4.60
vmtools-version: v1.5.24
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion contracts/crowdfunding-esdt/scenarios/_generated_fund.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
],
"function": "fund",
"arguments": [],
"gasLimit": "18446744073709551615"
"gasLimit": "5,000,000"
},
"expect": {
"out": [],
Expand Down
2 changes: 1 addition & 1 deletion contracts/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"egldValue": "1000",
"function": "fund",
"arguments": [],
"gasLimit": "18446744073709551615"
"gasLimit": "5,000,000"
},
"expect": {
"out": [],
Expand Down
20 changes: 0 additions & 20 deletions contracts/multisig/scenarios/changeBoard.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,6 @@
{
"step": "externalSteps",
"path": "steps/deploy.steps.json"
},
{
"step": "externalSteps",
"path": "steps/add_prop.steps.json"
},
{
"step": "externalSteps",
"path": "steps/add_bm.steps.json"
},
{
"step": "externalSteps",
"path": "steps/rem_alice.steps.json"
},
{
"step": "externalSteps",
"path": "steps/rem_unknown.steps.json"
},
{
"step": "externalSteps",
"path": "steps/sign_unsign_bad_action.steps.json"
}
]
}
2 changes: 1 addition & 1 deletion contracts/multisig/scenarios/deployAdder_err.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"arguments": [
"0",
"sc:adder-code",
"0x0000"
"0x0502"
],
"gasLimit": "200,000,000",
"gasPrice": "0"
Expand Down
33 changes: 18 additions & 15 deletions contracts/multisig/scenarios/deployAdder_then_call.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"arguments": [
"0",
"sc:adder-code",
"0x0000",
"0x0502",
"1234"
],
"gasLimit": "200,000,000",
Expand All @@ -49,31 +49,34 @@
"nonce": "0",
"balance": "0",
"storage": {
"str:user_count": "5",
"str:user_address_to_id|address:alice": "1",
"str:user_address_to_id|address:bob": "2",
"str:user_address_to_id|address:charlie": "3",
"str:user_address_to_id|address:paul": "4",
"str:user_address_to_id|address:dan": "5",
"str:user_id_to_address|u32:1": "address:alice",
"str:user_id_to_address|u32:2": "address:bob",
"str:user_id_to_address|u32:3": "address:charlie",
"str:user_id_to_address|u32:4": "address:paul",
"str:user_id_to_address|u32:5": "address:dan",
"str:user_ids_count": "5",
"str:user_ids_address_to_id|address:alice": "1",
"str:user_ids_address_to_id|address:bob": "2",
"str:user_ids_address_to_id|address:charlie": "3",
"str:user_ids_address_to_id|address:paul": "4",
"str:user_ids_address_to_id|address:dan": "5",
"str:user_ids_id_to_address|u32:1": "address:alice",
"str:user_ids_id_to_address|u32:2": "address:bob",
"str:user_ids_id_to_address|u32:3": "address:charlie",
"str:user_ids_id_to_address|u32:4": "address:paul",
"str:user_ids_id_to_address|u32:5": "address:dan",
"str:quorum_for_action|u32:1": "2",
"str:quorum_for_action|u32:2": "2",
"str:quorum_for_action|u32:3": "2",
"str:user_role|u32:1": "2",
"str:user_role|u32:2": "2",
"str:user_role|u32:3": "2",
"str:user_role|u32:4": "1",
"str:user_role|u32:5": "2",
"str:num_board_members": "4",
"str:num_proposers": "1",
"str:quorum": "2",
"str:quorum_ids": "2",
"str:action_data.len": "3",
"str:action_data.item|u32:3": {
"1-discriminant": "0x08",
"2-amount": "u32:0",
"3-code_source": "sc:adder-code",
"4-code_metadata": "0x0000",
"4-code_metadata": "0x0502",
"5-arguments": [
"u32:1",
"u32:2|1234"
Expand Down Expand Up @@ -258,7 +261,7 @@
},
"expect": {
"out": [],
"status": "",
"status": "0",
"logs": "*",
"gas": "*",
"refund": "*"
Expand Down
58 changes: 32 additions & 26 deletions contracts/multisig/scenarios/deployFactorial.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"arguments": [
"0",
"sc:factorial-code",
"0x0000"
"0x0502"
],
"gasLimit": "200,000,000",
"gasPrice": "0"
Expand All @@ -48,31 +48,34 @@
"nonce": "0",
"balance": "0",
"storage": {
"str:user_count": "5",
"str:user_address_to_id|address:alice": "1",
"str:user_address_to_id|address:bob": "2",
"str:user_address_to_id|address:charlie": "3",
"str:user_address_to_id|address:paul": "4",
"str:user_address_to_id|address:dan": "5",
"str:user_id_to_address|u32:1": "address:alice",
"str:user_id_to_address|u32:2": "address:bob",
"str:user_id_to_address|u32:3": "address:charlie",
"str:user_id_to_address|u32:4": "address:paul",
"str:user_id_to_address|u32:5": "address:dan",
"str:user_ids_count": "5",
"str:user_ids_address_to_id|address:alice": "1",
"str:user_ids_address_to_id|address:bob": "2",
"str:user_ids_address_to_id|address:charlie": "3",
"str:user_ids_address_to_id|address:paul": "4",
"str:user_ids_address_to_id|address:dan": "5",
"str:user_ids_id_to_address|u32:1": "address:alice",
"str:user_ids_id_to_address|u32:2": "address:bob",
"str:user_ids_id_to_address|u32:3": "address:charlie",
"str:user_ids_id_to_address|u32:4": "address:paul",
"str:user_ids_id_to_address|u32:5": "address:dan",
"str:quorum_for_action|u32:1": "2",
"str:quorum_for_action|u32:2": "2",
"str:quorum_for_action|u32:3": "2",
"str:user_role|u32:1": "2",
"str:user_role|u32:2": "2",
"str:user_role|u32:3": "2",
"str:user_role|u32:4": "1",
"str:user_role|u32:5": "2",
"str:num_board_members": "4",
"str:num_proposers": "1",
"str:quorum": "2",
"str:quorum_ids": "2",
"str:action_data.len": "3",
"str:action_data.item|u32:3": {
"1-discriminant": "0x08",
"2-amount": "u32:0",
"3-code_source": "sc:factorial-code",
"4-code_metadata": "0x0000",
"4-code_metadata": "0x0502",
"5-arguments": "u32:0"
}
},
Expand Down Expand Up @@ -163,25 +166,28 @@
"nonce": "1",
"balance": "0",
"storage": {
"str:user_count": "5",
"str:user_address_to_id|address:alice": "1",
"str:user_address_to_id|address:bob": "2",
"str:user_address_to_id|address:charlie": "3",
"str:user_address_to_id|address:paul": "4",
"str:user_address_to_id|address:dan": "5",
"str:user_id_to_address|u32:1": "address:alice",
"str:user_id_to_address|u32:2": "address:bob",
"str:user_id_to_address|u32:3": "address:charlie",
"str:user_id_to_address|u32:4": "address:paul",
"str:user_id_to_address|u32:5": "address:dan",
"str:user_ids_count": "5",
"str:user_ids_address_to_id|address:alice": "1",
"str:user_ids_address_to_id|address:bob": "2",
"str:user_ids_address_to_id|address:charlie": "3",
"str:user_ids_address_to_id|address:paul": "4",
"str:user_ids_address_to_id|address:dan": "5",
"str:user_ids_id_to_address|u32:1": "address:alice",
"str:user_ids_id_to_address|u32:2": "address:bob",
"str:user_ids_id_to_address|u32:3": "address:charlie",
"str:user_ids_id_to_address|u32:4": "address:paul",
"str:user_ids_id_to_address|u32:5": "address:dan",
"str:quorum_for_action|u32:1": "2",
"str:quorum_for_action|u32:2": "2",
"str:quorum_for_action|u32:3": "2",
"str:user_role|u32:1": "2",
"str:user_role|u32:2": "2",
"str:user_role|u32:3": "2",
"str:user_role|u32:4": "1",
"str:user_role|u32:5": "2",
"str:num_board_members": "4",
"str:num_proposers": "1",
"str:quorum": "2",
"str:quorum_ids": "2",
"str:action_data.len": "3"
},
"code": "file:../output/multisig.wasm"
Expand Down
10 changes: 5 additions & 5 deletions contracts/multisig/scenarios/deployOtherMultisig.scen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"arguments": [
"0",
"sc:multisig",
"0x0000",
"0x0502",
"1",
"address:paul"
],
Expand Down Expand Up @@ -125,12 +125,12 @@
"nonce": "0",
"balance": "0",
"storage": {
"str:user_count": "1",
"str:user_address_to_id|address:paul": "1",
"str:user_id_to_address|u32:1": "address:paul",
"str:user_ids_count": "1",
"str:user_ids_address_to_id|address:paul": "1",
"str:user_ids_id_to_address|u32:1": "address:paul",
"str:user_role|u32:1": "2",
"str:num_board_members": "1",
"str:quorum": "1"
"str:quorum_ids": "1"
},
"code": "file:../output/multisig.wasm"
},
Expand Down
16 changes: 8 additions & 8 deletions contracts/multisig/scenarios/steps/deploy.steps.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,18 @@
"nonce": "0",
"balance": "0",
"storage": {
"str:user_count": "3",
"str:user_address_to_id|address:alice": "1",
"str:user_address_to_id|address:bob": "2",
"str:user_address_to_id|address:charlie": "3",
"str:user_id_to_address|u32:1": "address:alice",
"str:user_id_to_address|u32:2": "address:bob",
"str:user_id_to_address|u32:3": "address:charlie",
"str:user_ids_count": "3",
"str:user_ids_address_to_id|address:alice": "1",
"str:user_ids_address_to_id|address:bob": "2",
"str:user_ids_address_to_id|address:charlie": "3",
"str:user_ids_id_to_address|u32:1": "address:alice",
"str:user_ids_id_to_address|u32:2": "address:bob",
"str:user_ids_id_to_address|u32:3": "address:charlie",
"str:user_role|u32:1": "2",
"str:user_role|u32:2": "2",
"str:user_role|u32:3": "2",
"str:num_board_members": "3",
"str:quorum": "2"
"str:quorum_ids": "2"
},
"code": "file:../../output/multisig.wasm"
},
Expand Down
Loading

0 comments on commit 37d970c

Please sign in to comment.