feat: expose proposal api to calimero sdk #911

MatejVukosav · 2024-10-31T17:17:10Z

Exposed wasm create_proposal function which creates proposal in proxy contract

crates/server/src/admin/service.rs

xilosada

crates/server/src/admin/handlers/proposals.rs

crates/server/src/admin/service.rs

…expose-proposal-api-to-calimero-sdk

crates/server/src/admin/handlers/proposals.rs

petarjuki7 · 2024-11-04T23:33:09Z

I added CLI capability, you can test it with:
cargo run -p meroctl -- --node-name <node_name> --home data --output-format json proxy get num-proposal-approvals <context_id> <proposal_id>

Other options are:
proposal
proposals
num-active-proposals
proposal-approvers

Also, had to make some changes in the handlers for the get APIs.

todo: better implementation of the Report trait for the structs used for proposals

…expose-proposal-api-to-calimero-sdk

…m:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

crates/sdk/src/env/ext.rs

apps/blockchain/src/lib.rs

packages/calimero-sdk/src/rpc/jsonrpc.ts

…m:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

…expose-proposal-api-to-calimero-sdk

crates/node/src/lib.rs

…m:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

miraclx · 2024-11-07T19:04:51Z

crates/sdk/src/env/ext.rs

@@ -74,6 +75,7 @@ pub struct DraftProposal {
    /// The actions to be executed by the proposal. One proposal can contain
    /// multiple actions to execute.
    actions: Vec<ProposalAction>,
+    approval: Option<ProposalId>,


this is needed here

🤦🏽 not needed

…r' of github.com:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

miraclx · 2024-11-08T10:50:52Z

crates/context/config/src/client/protocol/near.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 use std::collections::BTreeMap;
-use std::time;
+use std::{time, vec};


miraclx · 2024-11-08T10:51:16Z

crates/context/config/src/client/protocol/near.rs

+                gas: 300_000_000_000_000,
+                deposit: 5_000_000_000_000_000_000_000_000,


highlighting this to come back to it

miraclx · 2024-11-08T10:53:11Z

crates/context/src/lib.rs

+                context_config.network.as_ref().into(),
+                context_config.contract.as_ref().into(),
+            )
+            .propose(proposal_id, signer_id.rt().unwrap(), actions)


Suggested change

.propose(proposal_id, signer_id.rt().unwrap(), actions)

.propose(proposal_id, signer_id.rt().expect("infallible conversion"), actions)

while we want to avoid panic points, any thing that is "safe" to use unwrap, must define why that's the case

miraclx · 2024-11-08T10:53:18Z

crates/context/src/lib.rs

+                context_config.network.as_ref().into(),
+                context_config.contract.as_ref().into(),
+            )
+            .approve(signer_id.rt().unwrap(), proposal_id)


miraclx · 2024-11-08T10:53:47Z

crates/meroctl/src/cli.rs

@@ -49,6 +51,8 @@ pub enum SubCommands {
    App(AppCommand),
    Context(ContextCommand),
    Identity(IdentityCommand),
+    JsonRpc(CallCommand),


bad merge? this reintroduces JsonRpc

miraclx · 2024-11-08T10:55:40Z

crates/node/src/lib.rs

+            drop(
+                self.ctx_manager
+                    .propose(
+                        context_id,
+                        executor_public_key,
+                        proposal_id.clone(),
+                        actions,
+                    )
+                    .await,
+            );


handle the result instead of dropping.

miraclx · 2024-11-08T10:55:46Z

crates/node/src/lib.rs

+            drop(
+                self.ctx_manager
+                    .approve(context_id, executor_public_key, approval.clone())
+                    .await,
+            );


miraclx · 2024-11-08T10:56:59Z

crates/node/src/types.rs

+#[derive(Deserialize)]
+pub struct ProposalRequest {
+    pub sender: String,
+    pub receiver: String,
+}


now unused?

miraclx · 2024-11-08T10:57:32Z

crates/sdk/src/env/ext.rs

@@ -35,7 +36,7 @@ pub enum ProposalAction {
        receiver_id: AccountId,

        /// The amount of tokens to transfer.
-        amount: u64,
+        amount: u128,


deposit in function call should be u128 too

miraclx · 2024-11-08T10:57:54Z

crates/sdk/src/env/ext.rs

@@ -74,6 +75,7 @@ pub struct DraftProposal {
    /// The actions to be executed by the proposal. One proposal can contain
    /// multiple actions to execute.
    actions: Vec<ProposalAction>,
+    approval: Option<ProposalId>,


🤦🏽 not needed

feat: expose proposal api to calimero sdk

6a67c72

MatejVukosav requested review from miraclx, danwilliams, xilosada and petarjuki7 October 31, 2024 17:20

xilosada reviewed Oct 31, 2024

View reviewed changes

crates/server/src/admin/service.rs Show resolved Hide resolved

xilosada reviewed Oct 31, 2024

View reviewed changes

crates/server/src/admin/handlers/proposals.rs Outdated Show resolved Hide resolved

xilosada reviewed Oct 31, 2024

View reviewed changes

crates/server/src/admin/service.rs Show resolved Hide resolved

MatejVukosav added 4 commits October 31, 2024 18:28

fix: set args type to json

3e2673d

Merge branch 'master' of github.com:calimero-network/core into feat--…

dde48a2

…expose-proposal-api-to-calimero-sdk

fix: clippy issues

da43567

chore: move demo app to core as temp solution

2c03d07

MatejVukosav force-pushed the feat--expose-proposal-api-to-calimero-sdk branch from 7c056e9 to 2c03d07 Compare November 4, 2024 09:38

MatejVukosav self-assigned this Nov 4, 2024

petarjuki7 requested changes Nov 4, 2024

View reviewed changes

crates/server/src/admin/handlers/proposals.rs Show resolved Hide resolved

crates/server/src/admin/handlers/proposals.rs Show resolved Hide resolved

crates/server/src/admin/handlers/proposals.rs Show resolved Hide resolved

crates/server/src/admin/handlers/proposals.rs Show resolved Hide resolved

petarjuki7 added 2 commits November 5, 2024 00:21

Added CLI capability and fixed handler code

72cbe6b

Remove unnecessary import

aaf540f

petarjuki7 and others added 5 commits November 5, 2024 00:36

typo fix

0209be6

remove unnecessary print

d34a64a

Merge branch 'master' of github.com:calimero-network/core into feat--…

bdf49a6

…expose-proposal-api-to-calimero-sdk

Merge branch 'feat--expose-proposal-api-to-calimero-sdk' of github.co…

7bb3df1

…m:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

feat: add message methods

7f0ebd6

MatejVukosav force-pushed the feat--expose-proposal-api-to-calimero-sdk branch from b1952c2 to 7f0ebd6 Compare November 5, 2024 02:43

fix: json rpc

6e694e0

MatejVukosav commented Nov 5, 2024

View reviewed changes

crates/sdk/src/env/ext.rs Show resolved Hide resolved

MatejVukosav commented Nov 5, 2024

View reviewed changes

apps/blockchain/src/lib.rs Show resolved Hide resolved

MatejVukosav commented Nov 5, 2024

View reviewed changes

packages/calimero-sdk/src/rpc/jsonrpc.ts Outdated Show resolved Hide resolved

chefsale approved these changes Nov 5, 2024

View reviewed changes

MatejVukosav added 5 commits November 5, 2024 23:27

fix: undo contract change

672e846

Merge branch 'feat--expose-proposal-api-to-calimero-sdk' of github.co…

d406123

…m:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

fix: signing

ac5b9f4

fix: new contracts

ff64e36

refactor: clean

a91e016

MatejVukosav force-pushed the feat--expose-proposal-api-to-calimero-sdk branch from c03b79b to a91e016 Compare November 6, 2024 07:55

Merge branch 'master' of github.com:calimero-network/core into feat--…

683bde5

…expose-proposal-api-to-calimero-sdk

MatejVukosav force-pushed the feat--expose-proposal-api-to-calimero-sdk branch from 263b2fe to 683bde5 Compare November 6, 2024 09:52

MatejVukosav and others added 8 commits November 6, 2024 18:10

Merge branch 'master' of github.com:calimero-network/core into feat--…

55eec5e

…expose-proposal-api-to-calimero-sdk

fix: cleanup

2dcc378

fix: lint

9ea632b

fix: cleanup 2

69534b2

fix: cleanup 3

fd8293d

fix: cleanup 4

c3aeb1c

fix: lint

5c9ebfe

chore: update cargo lock

066f8c4

miraclx reviewed Nov 7, 2024

View reviewed changes

crates/node/src/lib.rs Outdated Show resolved Hide resolved

MatejVukosav added 2 commits November 8, 2024 01:49

refactor: approvals

cc1b9fe

Merge branch 'feat--expose-proposal-api-to-calimero-sdk' of github.co…

911dee0

…m:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

miraclx reviewed Nov 7, 2024

View reviewed changes

refactor: clean

c0eae80

MatejVukosav marked this pull request as ready for review November 8, 2024 05:47

MatejVukosav added 2 commits November 8, 2024 12:49

Merge branches 'feat--expose-proposal-api-to-calimero-sdk' and 'maste…

e00ba00

…r' of github.com:calimero-network/core into feat--expose-proposal-api-to-calimero-sdk

refactor: clean

c63dcfc

MatejVukosav force-pushed the feat--expose-proposal-api-to-calimero-sdk branch from aadce16 to c63dcfc Compare November 8, 2024 06:19

MatejVukosav removed the request for review from danwilliams November 8, 2024 06:24

fix: test

d27e685

MatejVukosav merged commit fc62560 into master Nov 8, 2024
3 checks passed

MatejVukosav deleted the feat--expose-proposal-api-to-calimero-sdk branch November 8, 2024 07:17

miraclx reviewed Nov 8, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: expose proposal api to calimero sdk #911

feat: expose proposal api to calimero sdk #911

MatejVukosav commented Oct 31, 2024 •

edited

Loading

xilosada left a comment

petarjuki7 commented Nov 4, 2024 •

edited

Loading

miraclx Nov 7, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

miraclx Nov 8, 2024

		gas: 300_000_000_000_000,
		deposit: 5_000_000_000_000_000_000_000_000,

	.propose(proposal_id, signer_id.rt().unwrap(), actions)
	.propose(proposal_id, signer_id.rt().expect("infallible conversion"), actions)

feat: expose proposal api to calimero sdk #911

feat: expose proposal api to calimero sdk #911

Conversation

MatejVukosav commented Oct 31, 2024 • edited Loading

xilosada left a comment

Choose a reason for hiding this comment

petarjuki7 commented Nov 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MatejVukosav commented Oct 31, 2024 •

edited

Loading

petarjuki7 commented Nov 4, 2024 •

edited

Loading