Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
2373240
First pass at dev environment for proxy colonies
area Aug 12, 2024
e320ca2
Give hardhat:cmd ability to execute on other chains
area Nov 20, 2024
fff644d
Add and expose WormholeScan mock API
area Dec 2, 2024
2e1f7e3
Spy shouldn't wait for txs in dev environment
area Jan 22, 2025
30218e3
fix: nix dev shell
chmanie Oct 21, 2024
a044c35
feat: add method to get a CustomContract in ColonyManager
chmanie Oct 30, 2024
2c706b8
feat: use wagmi/cli to generate type-safe abis
chmanie Nov 7, 2024
72a1387
wip: create proxy colony UI
bassgeta Nov 19, 2024
34b7ce6
Refactor: Update block ingestor docker config
mmioana Nov 29, 2024
d48c1f1
Feat: Add proxy block ingestor docker config
mmioana Dec 2, 2024
6f61649
Fix: multi-chain stats and refactoring
mmioana Dec 4, 2024
e7cd731
Feat: Add proxy colonies query and display list in UI
mmioana Dec 4, 2024
d2f883b
Fix: Update proxy block ingestor docker config
mmioana Dec 5, 2024
167600a
Feat: Add multichain info to action
bassgeta Dec 6, 2024
0eaed7e
Feat: Get colony creation event
bassgeta Dec 11, 2024
392f293
feat: use the colony creation salt instead of calling the network to …
bassgeta Dec 19, 2024
70e4a37
build: hashes and package-lock shennanigans after rebase
bassgeta Jan 20, 2025
aa26c30
build: keep the abis in the repo
bassgeta Jan 21, 2025
7bb803b
Fix: Upgrade colony sdk and update createProxyColony overrides
mmioana Jan 21, 2025
33dae16
Chore: Update block ingestor hash
mmioana Jan 16, 2025
6aee380
Feat: Add manage supported chain action
mmioana Dec 23, 2024
a7e5d1b
Fix: Action list index when ManageSupportedChains is disabled
mmioana Jan 14, 2025
be317c6
Feat: Re-enable deployed proxy colony
mmioana Jan 6, 2025
949af82
feat: create proxy colony motion
bassgeta Jan 7, 2025
f06d795
feat: add finalization action info to multisig and motions, and add a…
bassgeta Jan 10, 2025
79278b0
Refactor: Search select component and usage
mmioana Dec 26, 2024
907c8da
Refactor: Update TokenSearchSelect to use SearchSelect
mmioana Dec 27, 2024
aecfc02
Refactor: Rename search select option renderers and pass isMobile prop
mmioana Dec 27, 2024
edb1fe5
Fix: Add showSearchValueAsOption flag to SearchSelect
mmioana Jan 8, 2025
b41f28b
Refactor: Changes for TokenSearchSelect after review
mmioana Jan 13, 2025
5361f86
Feat: Allow addition of proxy colonies with multisig
davecreaser Jan 9, 2025
45dad03
feat: enable disable proxy colony via reputation
rumzledz Jan 14, 2025
dd658de
feat: update block ingestor hash and use constant form field var
rumzledz Jan 14, 2025
3ab0a79
feat: prefer encodeFunctionData usage
rumzledz Jan 15, 2025
895a414
feat: add support for enabling and disable proxy colonies via multi-sig
rumzledz Jan 13, 2025
12bb1c6
feat: add getMultiSigMotionParams util
rumzledz Jan 13, 2025
eb9d84c
Move targetChainId up to the top level of colonyAction
davecreaser Jan 16, 2025
963a7f3
Codegen after rebase
davecreaser Jan 21, 2025
7d782d1
Refactor: Remove unused var from docker and unused supported chains
mmioana Jan 22, 2025
c9c097e
Feat: Fetch available chains from DB and update SUPPORTED_CHAINS config
mmioana Jan 22, 2025
11b0f44
Fix: Add AMOY_NETWORK to supported chains config
mmioana Jan 22, 2025
96f923b
Chore: Update block ingestors hash
mmioana Jan 22, 2025
d619581
Merge pull request #4161 from JoinColony/feat/dynamically-add-support…
mmioana Jan 24, 2025
bf3122c
feat: decouple multiChainInfo to a new model
bassgeta Jan 28, 2025
72da835
Merge pull request #4199 from JoinColony/feat/4060-multichain-lag-fix
Jan 30, 2025
97959f5
Feat: M2 Proxy Colonies has started - will be removed
mmioana Jan 23, 2025
d66112e
Feat: Add colony native token deployment script for proxy chain
mmioana Jan 24, 2025
3f15c19
Feat: Add minting tokens script
mmioana Jan 27, 2025
e35f460
Refactor: Removed unlock and mint token functionality from deploy tok…
mmioana Jan 27, 2025
0c93532
feat: proxy colony incoming native tokens
iamsamgibbs Jan 28, 2025
d012e36
Fix up types
iamsamgibbs Jan 28, 2025
c2eb753
feat: update block-ingestor hash
iamsamgibbs Jan 28, 2025
1686ef2
Fix: Remove unnecessary comment and update incorrect chainId
iamsamgibbs Jan 29, 2025
969ca54
fix: updatge block-ingestor hash
iamsamgibbs Jan 29, 2025
b654bf4
fix: missed renaming balance variable
iamsamgibbs Jan 29, 2025
79a0768
Feat: Handle colony native token funds claims on different chain
mmioana Jan 28, 2025
c293fb5
Feat: Add claim tokens on all chains saga
mmioana Jan 29, 2025
019d93e
Refactor: Remove unused saga for claiming tokens on proxy chain
mmioana Jan 30, 2025
af57d65
Chore: Update network hash and refactor custom contract type
mmioana Jan 30, 2025
1e5d000
feat: proxy colony balances
iamsamgibbs Jan 30, 2025
2fb9cc1
fix: handle domainId is empty string
iamsamgibbs Jan 31, 2025
83430c3
feat: only call new contract methods in lambda if colony version supp…
iamsamgibbs Jan 31, 2025
50ff647
Feat: Update fetchDomainBalance lambda to account for proxy chains
mmioana Jan 31, 2025
4ebbd2f
Feat: Add support for older colony versions
mmioana Feb 3, 2025
bef86d9
Chore: Update colony js package version
mmioana Feb 4, 2025
f7144e8
Refactor: Replace colonyClaimToken with colonyClaimFunds saga
mmioana Feb 4, 2025
822e0f5
Refactor: Change order for token address and chain id
mmioana Feb 4, 2025
8d3802e
Merge pull request #4218 from JoinColony/feat/4092-proxy-colony-balances
iamsamgibbs Feb 5, 2025
2672558
Merge pull request #4225 from JoinColony/feat/4221-domain-balance-lam…
mmioana Feb 5, 2025
fb9500b
Chore: Update block ingestor hash
mmioana Feb 5, 2025
36a28b8
Merge pull request #4242 from JoinColony/refactor/4235-remove-colony-…
mmioana Feb 7, 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
36 changes: 36 additions & 0 deletions amplify/backend/api/colonycdapp/schema/proxyColonies.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
"""
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
}
99 changes: 97 additions & 2 deletions amplify/backend/api/colonycdapp/schema/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,18 @@ enum ColonyActionType {
MANAGE_TOKENS
MANAGE_TOKENS_MOTION
MANAGE_TOKENS_MULTISIG
"""
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 +1541,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 +1565,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 @@ -1575,7 +1602,7 @@ type Colony @model {
Native chain token claim (e.g., Token 0x0000...0000: ETH, xDAI, etc.)
This is not an array since only a single token type can be returned
"""
chainFundsClaim: ColonyChainFundsClaim
chainFundsClaim: [ColonyChainFundsClaim]
@function(name: "fetchColonyNativeFundsClaim-${env}")
"""
Type of the Colony (Regular or Metacolony)
Expand Down Expand Up @@ -1649,6 +1676,10 @@ type Colony @model {
"""
colonyMemberInvite: ColonyMemberInvite
@hasOne(fields: ["colonyMemberInviteCode"])
"""
List of proxy colonies related to this colony
"""
proxyColonies: [ProxyColony] @hasMany(indexName: "byColonyAddress", fields: ["id"])
}

input ValidateUserInviteInput {
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
50 changes: 25 additions & 25 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.1.0",
"@colony/events": "^0.0.0-snapshot-20240329154314",
"cross-fetch": "^4.0.0",
"date-fns": "^3.6.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"inputs": [
{
"internalType": "uint256",
"name": "_potId",
"type": "uint256"
},
{
"internalType": "address",
"name": "_token",
"type": "address"
}
],
"name": "getFundingPotBalance",
"outputs": [
{
"internalType": "uint256",
"name": "balance",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[
{
"inputs": [
{
"internalType": "uint256",
"name": "_potId",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "_chainId",
"type": "uint256"
},
{
"internalType": "address",
"name": "_token",
"type": "address"
}
],
"name": "getFundingPotBalance",
"outputs": [
{
"internalType": "uint256",
"name": "balance",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
}
]
Loading