Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
fb4420b
First pass at dev environment for proxy colonies
area Aug 12, 2024
13e8c49
Give hardhat:cmd ability to execute on other chains
area Nov 20, 2024
5a4e18f
Add and expose WormholeScan mock API
area Dec 2, 2024
c2686aa
Spy shouldn't wait for txs in dev environment
area Jan 22, 2025
dd55e9a
fix: nix dev shell
chmanie Oct 21, 2024
5b817b2
feat: add method to get a CustomContract in ColonyManager
chmanie Oct 30, 2024
ff66842
feat: use wagmi/cli to generate type-safe abis
chmanie Nov 7, 2024
227e9b7
wip: create proxy colony UI
bassgeta Nov 19, 2024
00cb1ad
Refactor: Update block ingestor docker config
mmioana Nov 29, 2024
35b60ee
Feat: Add proxy block ingestor docker config
mmioana Dec 2, 2024
b7eb9e9
Fix: multi-chain stats and refactoring
mmioana Dec 4, 2024
8ceab8a
Feat: Add proxy colonies query and display list in UI
mmioana Dec 4, 2024
69f3b13
Fix: Update proxy block ingestor docker config
mmioana Dec 5, 2024
6cc83d5
Feat: Add multichain info to action
bassgeta Dec 6, 2024
8199b4a
Feat: Get colony creation event
bassgeta Dec 11, 2024
aaf4b7f
feat: use the colony creation salt instead of calling the network to …
bassgeta Dec 19, 2024
70020ca
build: hashes and package-lock shennanigans after rebase
bassgeta Jan 20, 2025
b9a18e4
build: keep the abis in the repo
bassgeta Jan 21, 2025
83755fb
Fix: Upgrade colony sdk and update createProxyColony overrides
mmioana Jan 21, 2025
9ac7f99
Chore: Update block ingestor hash
mmioana Jan 16, 2025
a5c6403
Feat: Add manage supported chain action
mmioana Dec 23, 2024
7c18c3d
Fix: Action list index when ManageSupportedChains is disabled
mmioana Jan 14, 2025
06e5c4e
Feat: Re-enable deployed proxy colony
mmioana Jan 6, 2025
001d0b1
feat: create proxy colony motion
bassgeta Jan 7, 2025
6b0ed4e
feat: add finalization action info to multisig and motions, and add a…
bassgeta Jan 10, 2025
46e26f4
Refactor: Search select component and usage
mmioana Dec 26, 2024
5f64d2f
Refactor: Update TokenSearchSelect to use SearchSelect
mmioana Dec 27, 2024
480a60a
Refactor: Rename search select option renderers and pass isMobile prop
mmioana Dec 27, 2024
8e55ef5
Fix: Add showSearchValueAsOption flag to SearchSelect
mmioana Jan 8, 2025
a23c3d7
Refactor: Changes for TokenSearchSelect after review
mmioana Jan 13, 2025
a1a9c60
Feat: Allow addition of proxy colonies with multisig
davecreaser Jan 9, 2025
b80eb48
feat: enable disable proxy colony via reputation
rumzledz Jan 14, 2025
790a90b
feat: update block ingestor hash and use constant form field var
rumzledz Jan 14, 2025
75e46d1
feat: prefer encodeFunctionData usage
rumzledz Jan 15, 2025
22975ab
feat: add support for enabling and disable proxy colonies via multi-sig
rumzledz Jan 13, 2025
7c77745
feat: add getMultiSigMotionParams util
rumzledz Jan 13, 2025
c447602
Move targetChainId up to the top level of colonyAction
davecreaser Jan 16, 2025
a45f5f1
Codegen after rebase
davecreaser Jan 21, 2025
7a3b888
Refactor: Remove unused var from docker and unused supported chains
mmioana Jan 22, 2025
f24d5a1
Feat: Fetch available chains from DB and update SUPPORTED_CHAINS config
mmioana Jan 22, 2025
7aaa1f6
Fix: Add AMOY_NETWORK to supported chains config
mmioana Jan 22, 2025
aae7706
Chore: Update block ingestors hash
mmioana Jan 22, 2025
f572f9b
feat: decouple multiChainInfo to a new model
bassgeta Jan 28, 2025
57b1137
Fix: yield put in createProxy saga
iamsamgibbs Feb 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ scripts
postcss.config.js
webpack.*
src/graphql/generated.ts
src/constants/abis.ts


# amplify
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ cypress/screenshots
/playwright-report/
/blob-report/
/playwright/.cache/
/network-files

.vscode
.DS_Store
Expand Down
35 changes: 35 additions & 0 deletions amplify/backend/api/colonycdapp/schema/proxyColonies.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""
Table representing a deployed proxy colony
"""
type ProxyColony @model {
"""
id in the format of colonyAddress_chainId
"""
id: ID!
"""
Address of the colony on the blockchain
"""
colonyAddress: ID! @index(
name: "byColonyAddress"
queryField: "getProxyColoniesByColonyAddress"
)
"""
The chainId it's deployed on
"""
chainId: String!
"""
A flag that tells us if the proxy is active or not
"""
isActive: Boolean!
}

type SupportedChain @model {
"""
The chainId of the supported chain
"""
id: ID!
"""
A flag that tells us if the supported chain is active or not
"""
isActive: Boolean
}
97 changes: 96 additions & 1 deletion amplify/backend/api/colonycdapp/schema/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,22 @@ enum ColonyActionType {
MANAGE_TOKENS
MANAGE_TOKENS_MOTION
MANAGE_TOKENS_MULTISIG
"""
An action related to arbitrary transaction
"""
ARBITRARY_TX
"""
An action related to creating a proxy colony
"""
ADD_PROXY_COLONY
ADD_PROXY_COLONY_MOTION
ADD_PROXY_COLONY_MULTISIG
"""
An action related to disabling a proxy colony
"""
REMOVE_PROXY_COLONY
REMOVE_PROXY_COLONY_MOTION
REMOVE_PROXY_COLONY_MULTISIG
}

"""
Expand Down Expand Up @@ -1529,6 +1545,17 @@ type ColonyContributor @model @searchable {
@hasMany(indexName: "byTargetAddress", fields: ["contributorAddress"])
}

type ColonyCreateEvent {
"""
The block number the colony was created at
"""
blockNumber: Int!
"""
The salt used during creation
"""
creationSalt: String!
}

"""
Represents a Colony within the Colony Network
"""
Expand All @@ -1542,6 +1569,10 @@ type Colony @model {
"""
name: String! @index(name: "byName", queryField: "getColonyByName")
"""
Colony creation data
"""
colonyCreateEvent: ColonyCreateEvent
"""
The unique address of the native token of the Colony
"""
nativeTokenId: ID!
Expand Down Expand Up @@ -2875,6 +2906,18 @@ type ColonyMultiSig @model {
"""
expenditureId: ID
@index(name: "byExpenditureId", queryField: "getMultiSigByExpenditureId")
"""
The action txHash that was triggered upon motion finalization
"""
finalizationActionId: ID
@index(
name: "byFinalizationActionId"
queryField: "getColonyMultiSigByFinalizationActionId"
)
"""
Expanded `ColonyAction`
"""
finalizationActionData: ColonyAction @hasOne(fields: ["finalizationActionId"])
}
"""
Represents a Motion within a Colony
Expand Down Expand Up @@ -3010,6 +3053,18 @@ type ColonyMotion @model {
the details of tokens and amounts to be funded
"""
expenditureFunding: [ExpenditureFundingItem!]
"""
The action txHash that was triggered upon motion finalization
"""
finalizationActionId: ID
@index(
name: "byFinalizationActionId"
queryField: "getColonyMotionByFinalizationActionId"
)
"""
Expanded `ColonyAction`
"""
finalizationActionData: ColonyAction @hasOne(fields: ["finalizationActionId"])
}

type ExpenditureFundingItem {
Expand Down Expand Up @@ -3523,8 +3578,43 @@ type ColonyAction @model @searchable {
Ids of the staged payment slots released by the action, if any
"""
expenditureSlotIds: [Int!]

arbitraryTransactions: [ColonyActionArbitraryTransaction!]
"""
The id of the multichain info entry
"""
multiChainInfoId: ID
"""
Multichain info if the action is bridged
"""
multiChainInfo: MultiChainInfo @hasOne(fields: ["multiChainInfoId"])
"""
Target chain id if the action is on a proxy colony chain
"""
targetChainId: Int
"""
The motion action txHash that this action finalized
"""
finalizedActionId: ID
"""
Expanded `ColonyAction`
"""
finalizedActionData: ColonyAction @hasOne(fields: ["finalizedActionId"])
}

type MultiChainInfo @model {
"""
The format is txHash_chainId
"""
id: ID!
completedOnMainChain: Boolean!
completedOnProxyChain: Boolean!
wormholeInfo: ActionWormholeInfo
}

type ActionWormholeInfo {
emitterChainId: Int
emitterAddress: String!
sequence: String!
}

"""
Expand Down Expand Up @@ -3819,6 +3909,11 @@ type IngestorStats @model {
"""
id: ID!
"""
The chain id the stats are generated on
"""
chainId: String!
@index(name: "byChainId", queryField: "getIngestorStatsByChainId")
"""
JSON string to pass custom, dynamic values
"""
value: String!
Expand Down
34 changes: 17 additions & 17 deletions amplify/backend/function/cacheDomainBalance/src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@types/aws-lambda": "^8.10.92"
},
"dependencies": {
"@colony/colony-js": "^8.0.0-next.0",
"@colony/colony-js": "^8.0.0-next.1",
"@colony/events": "^0.0.0-snapshot-20240329154314",
"cross-fetch": "^4.0.0",
"date-fns": "^3.6.0"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@types/aws-lambda": "^8.10.92"
},
"dependencies": {
"@colony/colony-js": "^8.0.0-next.0",
"@colony/colony-js": "^8.0.0-next.1",
"@colony/events": "3.0.0",
"cross-fetch": "^4.0.0",
"ethers": "^5.7.2"
Expand Down
Loading