From dc1474c7a5891ee1665fbf035b97b3d362dd2661 Mon Sep 17 00:00:00 2001 From: Norman Meier Date: Wed, 13 Mar 2024 16:03:29 +0100 Subject: [PATCH] chore: rename escrow -> projects_manager Signed-off-by: Norman Meier --- examples/gno.land/r/demo/teritori/README.md | 10 ++++--- .../r/demo/teritori/escrow/escrow_test.gno | 1 - .../r/demo/teritori/justicedao/gno.mod | 10 +++---- .../r/demo/teritori/justicedao/justicedao.gno | 6 ++-- .../escrow_public_testnet.sh | 26 ++++++++--------- .../escrow_teritori_testnet.sh | 28 +++++++++---------- .../{escrow => projects_manager}/gno.mod | 2 +- .../projects_manager.gno} | 2 +- .../projects_manager_test.gno | 1 + .../{escrow => projects_manager}/spec.md | 0 10 files changed, 44 insertions(+), 42 deletions(-) delete mode 100644 examples/gno.land/r/demo/teritori/escrow/escrow_test.gno rename examples/gno.land/r/demo/teritori/{escrow => projects_manager}/escrow_public_testnet.sh (82%) rename examples/gno.land/r/demo/teritori/{escrow => projects_manager}/escrow_teritori_testnet.sh (83%) rename examples/gno.land/r/demo/teritori/{escrow => projects_manager}/gno.mod (71%) rename examples/gno.land/r/demo/teritori/{escrow/escrow.gno => projects_manager/projects_manager.gno} (99%) create mode 100644 examples/gno.land/r/demo/teritori/projects_manager/projects_manager_test.gno rename examples/gno.land/r/demo/teritori/{escrow => projects_manager}/spec.md (100%) diff --git a/examples/gno.land/r/demo/teritori/README.md b/examples/gno.land/r/demo/teritori/README.md index 2740976dbcc..4fe806213a3 100644 --- a/examples/gno.land/r/demo/teritori/README.md +++ b/examples/gno.land/r/demo/teritori/README.md @@ -56,7 +56,7 @@ Provides the list of existing DAOs It also provides the DAOs infos (name, description, pfp) until we use the [dedicated profile realm](https://github.com/gnolang/gno/pull/181) -See the [live demo](https://app.teritori.com/orgs?network=gno-teritori) +See the [live demo](https://app.teritori.com/orgs?network=gno-portal) ### gno.land/r/demo/teritori/dao_realm @@ -88,15 +88,17 @@ Social feed contract that strives to have feature-parity with Teritori's cosmwas It supports content flagging and moderation by DAOs -See the [live demo](https://app.teritori.com/feed?network=gno-teritori) +See the [live demo](https://app.teritori.com/feed?network=gno-portal) ### gno.land/r/demo/teritori/social_feeds_dao Example of a DAO that can moderate social feeds -### gno.land/r/demo/teritori/escrow +### gno.land/r/demo/teritori/projects_manager -Escrow contract, will be used in grants manager and freelance marketplace +Kanban with integrated payments and conflict resolution + +See the [live demo](https://app.teritori.com/projects?network=gno-portal) ### gno.land/r/demo/teritori/gnodaos diff --git a/examples/gno.land/r/demo/teritori/escrow/escrow_test.gno b/examples/gno.land/r/demo/teritori/escrow/escrow_test.gno deleted file mode 100644 index 20f510ced23..00000000000 --- a/examples/gno.land/r/demo/teritori/escrow/escrow_test.gno +++ /dev/null @@ -1 +0,0 @@ -package escrow diff --git a/examples/gno.land/r/demo/teritori/justicedao/gno.mod b/examples/gno.land/r/demo/teritori/justicedao/gno.mod index 81f557b113f..5ce590e935e 100644 --- a/examples/gno.land/r/demo/teritori/justicedao/gno.mod +++ b/examples/gno.land/r/demo/teritori/justicedao/gno.mod @@ -1,8 +1,8 @@ module gno.land/r/demo/teritori/justicedao require ( - "gno.land/p/demo/avl" v0.0.0-latest - "gno.land/p/demo/ufmt" v0.0.0-latest - "gno.land/r/demo/teritori/escrow" v0.0.0-latest - "gno.land/r/demo/teritori/vrf" v0.0.0-latest -) \ No newline at end of file + gno.land/p/demo/avl v0.0.0-latest + gno.land/p/demo/ufmt v0.0.0-latest + gno.land/r/demo/teritori/projects_manager v0.0.0-latest + gno.land/r/demo/teritori/vrf v0.0.0-latest +) diff --git a/examples/gno.land/r/demo/teritori/justicedao/justicedao.gno b/examples/gno.land/r/demo/teritori/justicedao/justicedao.gno index 8f19b5f33f8..18dd7c2121a 100644 --- a/examples/gno.land/r/demo/teritori/justicedao/justicedao.gno +++ b/examples/gno.land/r/demo/teritori/justicedao/justicedao.gno @@ -8,7 +8,7 @@ import ( "gno.land/p/demo/avl" fmt "gno.land/p/demo/ufmt" - "gno.land/r/demo/teritori/escrow" + "gno.land/r/demo/teritori/projects_manager" "gno.land/r/demo/teritori/vrf" ) @@ -98,7 +98,7 @@ type JusticeProposal struct { summary string // proposal summary vrfId uint64 // the vrf request id being used to determine governers governers []string // the governers of the proposal - contractId uint64 // the escrow contract id to resolve + contractId uint64 // the projects_manager contract id to resolve sellerAmount uint64 // the seller amount determined by Justice DAO solution string // proposed result of justice DAO proposal submitTime uint64 // solution submission time @@ -681,7 +681,7 @@ func TallyAndExecuteJusticeSolution(proposalId uint64) { // If more than 2/3 votes Yes, let it pass if numYesVotes > 0 && numYesVotes*3 >= uint64(len(proposal.governers))*2 { justiceProposals[proposalId].status = PASSED - escrow.CompleteContractByDAO(proposal.contractId, proposal.sellerAmount) + projects_manager.CompleteContractByDAO(proposal.contractId, proposal.sellerAmount) } else { justiceProposals[proposalId].status = REJECTED } diff --git a/examples/gno.land/r/demo/teritori/escrow/escrow_public_testnet.sh b/examples/gno.land/r/demo/teritori/projects_manager/escrow_public_testnet.sh similarity index 82% rename from examples/gno.land/r/demo/teritori/escrow/escrow_public_testnet.sh rename to examples/gno.land/r/demo/teritori/projects_manager/escrow_public_testnet.sh index 018778e1cda..2a68f889f38 100644 --- a/examples/gno.land/r/demo/teritori/escrow/escrow_public_testnet.sh +++ b/examples/gno.land/r/demo/teritori/projects_manager/escrow_public_testnet.sh @@ -18,8 +18,8 @@ gnokey maketx addpkg \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgdir="./r/escrow" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgdir="./r/projects_manager" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ gopher # Set config @@ -29,7 +29,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="UpdateConfig" \ -args="g1c5y8jpe585uezcvlmgdjmk5jt2glfw88wxa3xq" \ gopher @@ -41,7 +41,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="CreateContract" \ -args="g1c5y8jpe585uezcvlmgdjmk5jt2glfw88wxa3xq" \ -args="foo20" \ @@ -56,7 +56,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="CancelContract" \ -args="0" \ gopher @@ -68,7 +68,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="AcceptContract" \ -args="0" \ gopher @@ -80,7 +80,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="PauseContract" \ -args="0" \ gopher @@ -92,7 +92,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="CompleteContract" \ -args="0" \ gopher @@ -104,7 +104,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="CompleteContractByDAO" \ -args="0" \ -args="50" \ @@ -117,22 +117,22 @@ gnokey maketx call \ -broadcast="true" \ -remote="test3.gno.land:36657" \ -chainid="test3" \ - -pkgpath="gno.land/r/demo/escrow_03" \ + -pkgpath="gno.land/r/demo/projects_manager_03" \ -func="GiveFeedback" \ -args="0" \ -args="Amazing work" \ gopher # Query Contracts -gnokey query "vm/qeval" -data="gno.land/r/demo/escrow_03 +gnokey query "vm/qeval" -data="gno.land/r/demo/projects_manager_03 RenderContracts(0, 10)" -remote="test3.gno.land:36657" # Query contract -gnokey query "vm/qeval" -data="gno.land/r/demo/escrow_03 +gnokey query "vm/qeval" -data="gno.land/r/demo/projects_manager_03 RenderContract(0)" -remote="test3.gno.land:36657" # Query config -gnokey query "vm/qeval" -data="gno.land/r/demo/escrow_03 +gnokey query "vm/qeval" -data="gno.land/r/demo/projects_manager_03 RenderConfig()" -remote="test3.gno.land:36657" diff --git a/examples/gno.land/r/demo/teritori/escrow/escrow_teritori_testnet.sh b/examples/gno.land/r/demo/teritori/projects_manager/escrow_teritori_testnet.sh similarity index 83% rename from examples/gno.land/r/demo/teritori/escrow/escrow_teritori_testnet.sh rename to examples/gno.land/r/demo/teritori/projects_manager/escrow_teritori_testnet.sh index 1bc45424bb2..d359acdac6c 100644 --- a/examples/gno.land/r/demo/teritori/escrow/escrow_teritori_testnet.sh +++ b/examples/gno.land/r/demo/teritori/projects_manager/escrow_teritori_testnet.sh @@ -30,8 +30,8 @@ gnokey maketx addpkg \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgdir="./r/escrow" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgdir="./r/projects_manager" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ teritori # Set config @@ -41,7 +41,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="UpdateConfig" \ -args="g1c5y8jpe585uezcvlmgdjmk5jt2glfw88wxa3xq" \ teritori @@ -53,7 +53,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="CreateContract" \ -args="g1c5y8jpe585uezcvlmgdjmk5jt2glfw88wxa3xq" \ -args="gopher20" \ @@ -68,7 +68,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="CancelContract" \ -args="0" \ teritori @@ -80,7 +80,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="AcceptContract" \ -args="1" \ gopher2 @@ -92,7 +92,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="PauseContract" \ -args="0" \ teritori @@ -104,7 +104,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="CompleteContract" \ -args="1" \ teritori @@ -116,7 +116,7 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="CompleteContractByDAO" \ -args="0" \ -args="50" \ @@ -129,26 +129,26 @@ gnokey maketx call \ -broadcast="true" \ -remote="51.15.236.215:26657" \ -chainid="teritori-1" \ - -pkgpath="gno.land/r/demo/escrow_05" \ + -pkgpath="gno.land/r/demo/projects_manager_05" \ -func="GiveFeedback" \ -args="0" \ -args="Amazing work" \ teritori # Query Contracts -gnokey query "vm/qeval" -data="gno.land/r/demo/escrow_05 +gnokey query "vm/qeval" -data="gno.land/r/demo/projects_manager_05 RenderContracts(0, 10)" -remote="51.15.236.215:26657" # Query contract -gnokey query "vm/qeval" -data="gno.land/r/demo/escrow_05 +gnokey query "vm/qeval" -data="gno.land/r/demo/projects_manager_05 RenderContract(0)" -remote="51.15.236.215:26657" # Query config -gnokey query "vm/qeval" -data="gno.land/r/demo/escrow_05 +gnokey query "vm/qeval" -data="gno.land/r/demo/projects_manager_05 RenderConfig()" -remote="51.15.236.215:26657" # Query escrow address -gnokey query "vm/qeval" -data="gno.land/r/demo/escrow_05 +gnokey query "vm/qeval" -data="gno.land/r/demo/projects_manager_05 CurrentRealm()" -remote="51.15.236.215:26657" diff --git a/examples/gno.land/r/demo/teritori/escrow/gno.mod b/examples/gno.land/r/demo/teritori/projects_manager/gno.mod similarity index 71% rename from examples/gno.land/r/demo/teritori/escrow/gno.mod rename to examples/gno.land/r/demo/teritori/projects_manager/gno.mod index 3a3a24d36fd..de603c97c17 100644 --- a/examples/gno.land/r/demo/teritori/escrow/gno.mod +++ b/examples/gno.land/r/demo/teritori/projects_manager/gno.mod @@ -1,4 +1,4 @@ -module gno.land/r/demo/teritori/escrow +module gno.land/r/demo/teritori/projects_manager require ( gno.land/p/demo/ufmt v0.0.0-latest diff --git a/examples/gno.land/r/demo/teritori/escrow/escrow.gno b/examples/gno.land/r/demo/teritori/projects_manager/projects_manager.gno similarity index 99% rename from examples/gno.land/r/demo/teritori/escrow/escrow.gno rename to examples/gno.land/r/demo/teritori/projects_manager/projects_manager.gno index 4c601daa841..1385c79940f 100644 --- a/examples/gno.land/r/demo/teritori/escrow/escrow.gno +++ b/examples/gno.land/r/demo/teritori/projects_manager/projects_manager.gno @@ -1,4 +1,4 @@ -package escrow +package projects_manager import ( "std" diff --git a/examples/gno.land/r/demo/teritori/projects_manager/projects_manager_test.gno b/examples/gno.land/r/demo/teritori/projects_manager/projects_manager_test.gno new file mode 100644 index 00000000000..1a0ef1916b9 --- /dev/null +++ b/examples/gno.land/r/demo/teritori/projects_manager/projects_manager_test.gno @@ -0,0 +1 @@ +package projects_manager diff --git a/examples/gno.land/r/demo/teritori/escrow/spec.md b/examples/gno.land/r/demo/teritori/projects_manager/spec.md similarity index 100% rename from examples/gno.land/r/demo/teritori/escrow/spec.md rename to examples/gno.land/r/demo/teritori/projects_manager/spec.md