Skip to content

Commit

Permalink
chore: rename escrow -> projects_manager
Browse files Browse the repository at this point in the history
Signed-off-by: Norman Meier <norman@samourai.coop>
  • Loading branch information
n0izn0iz committed Apr 10, 2024
1 parent 19e50eb commit dc1474c
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 42 deletions.
10 changes: 6 additions & 4 deletions examples/gno.land/r/demo/teritori/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion examples/gno.land/r/demo/teritori/escrow/escrow_test.gno

This file was deleted.

10 changes: 5 additions & 5 deletions examples/gno.land/r/demo/teritori/justicedao/gno.mod
Original file line number Diff line number Diff line change
@@ -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
)
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
)
6 changes: 3 additions & 3 deletions examples/gno.land/r/demo/teritori/justicedao/justicedao.gno
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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" \
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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" \
Expand All @@ -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"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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" \
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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" \
Expand All @@ -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"


Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package escrow
package projects_manager

import (
"std"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package projects_manager

0 comments on commit dc1474c

Please sign in to comment.