diff --git a/amplify/backend/api/colonycdapp/schema/schema.graphql b/amplify/backend/api/colonycdapp/schema/schema.graphql index ef8868ad0d7..e1ab23e68f2 100644 --- a/amplify/backend/api/colonycdapp/schema/schema.graphql +++ b/amplify/backend/api/colonycdapp/schema/schema.graphql @@ -3299,6 +3299,7 @@ type Payment { Network fee amount """ networkFee: String + chainId: String tokenAddress: String! recipientAddress: String! } diff --git a/amplify/backend/function/cacheDomainBalance/src/package-lock.json b/amplify/backend/function/cacheDomainBalance/src/package-lock.json index 44a892724f3..3d5e8912b63 100644 --- a/amplify/backend/function/cacheDomainBalance/src/package-lock.json +++ b/amplify/backend/function/cacheDomainBalance/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "^0.0.0-snapshot-20240329154314", "cross-fetch": "^4.0.0", "date-fns": "^3.6.0" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -95,13 +92,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/cacheDomainBalance/src/package.json b/amplify/backend/function/cacheDomainBalance/src/package.json index e44a5fc5644..2c48ce5c982 100644 --- a/amplify/backend/function/cacheDomainBalance/src/package.json +++ b/amplify/backend/function/cacheDomainBalance/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "^0.0.0-snapshot-20240329154314", "cross-fetch": "^4.0.0", "date-fns": "^3.6.0" diff --git a/amplify/backend/function/fetchColonyBalances/src/package-lock.json b/amplify/backend/function/fetchColonyBalances/src/package-lock.json index 195df7df792..1c60d94f5fd 100644 --- a/amplify/backend/function/fetchColonyBalances/src/package-lock.json +++ b/amplify/backend/function/fetchColonyBalances/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -99,13 +96,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/fetchColonyBalances/src/package.json b/amplify/backend/function/fetchColonyBalances/src/package.json index 8fd656fb439..4762bf1a9f3 100644 --- a/amplify/backend/function/fetchColonyBalances/src/package.json +++ b/amplify/backend/function/fetchColonyBalances/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" diff --git a/amplify/backend/function/fetchDomainBalance/src/package-lock.json b/amplify/backend/function/fetchDomainBalance/src/package-lock.json index 7bbc3efdcd6..4403309217c 100644 --- a/amplify/backend/function/fetchDomainBalance/src/package-lock.json +++ b/amplify/backend/function/fetchDomainBalance/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "date-fns": "^3.6.0", @@ -20,49 +20,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", - "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", + "dependencies": { + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -98,13 +95,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/fetchDomainBalance/src/package.json b/amplify/backend/function/fetchDomainBalance/src/package.json index 5bbed4f6bb4..7ff3cd19da3 100644 --- a/amplify/backend/function/fetchDomainBalance/src/package.json +++ b/amplify/backend/function/fetchDomainBalance/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "date-fns": "^3.6.0", diff --git a/amplify/backend/function/fetchMotionState/src/package-lock.json b/amplify/backend/function/fetchMotionState/src/package-lock.json index 2da73a96bf0..028ce587aa2 100644 --- a/amplify/backend/function/fetchMotionState/src/package-lock.json +++ b/amplify/backend/function/fetchMotionState/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.1.3" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -99,13 +96,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/fetchMotionState/src/package.json b/amplify/backend/function/fetchMotionState/src/package.json index f40e182d936..2cb5cb45d28 100644 --- a/amplify/backend/function/fetchMotionState/src/package.json +++ b/amplify/backend/function/fetchMotionState/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.1.3" diff --git a/amplify/backend/function/fetchMotionTimeoutPeriods/src/package-lock.json b/amplify/backend/function/fetchMotionTimeoutPeriods/src/package-lock.json index 733506fbedc..4fab581fc8f 100644 --- a/amplify/backend/function/fetchMotionTimeoutPeriods/src/package-lock.json +++ b/amplify/backend/function/fetchMotionTimeoutPeriods/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -99,13 +96,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/fetchMotionTimeoutPeriods/src/package.json b/amplify/backend/function/fetchMotionTimeoutPeriods/src/package.json index c3898bad52b..0921ad9a1ae 100644 --- a/amplify/backend/function/fetchMotionTimeoutPeriods/src/package.json +++ b/amplify/backend/function/fetchMotionTimeoutPeriods/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" diff --git a/amplify/backend/function/fetchVoterRewards/src/package-lock.json b/amplify/backend/function/fetchVoterRewards/src/package-lock.json index c3be154af37..37e3fccf709 100644 --- a/amplify/backend/function/fetchVoterRewards/src/package-lock.json +++ b/amplify/backend/function/fetchVoterRewards/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.1.3" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -99,13 +96,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/fetchVoterRewards/src/package.json b/amplify/backend/function/fetchVoterRewards/src/package.json index 2c87202ad3b..92be8c7da28 100644 --- a/amplify/backend/function/fetchVoterRewards/src/package.json +++ b/amplify/backend/function/fetchVoterRewards/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.1.3" diff --git a/amplify/backend/function/getUserReputation/src/package-lock.json b/amplify/backend/function/getUserReputation/src/package-lock.json index 309608fd4d7..dc972b979c9 100644 --- a/amplify/backend/function/getUserReputation/src/package-lock.json +++ b/amplify/backend/function/getUserReputation/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -99,13 +96,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/getUserReputation/src/package.json b/amplify/backend/function/getUserReputation/src/package.json index 028cd73dd43..1f99c00e01a 100644 --- a/amplify/backend/function/getUserReputation/src/package.json +++ b/amplify/backend/function/getUserReputation/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" diff --git a/amplify/backend/function/getUserTokenBalance/src/package-lock.json b/amplify/backend/function/getUserTokenBalance/src/package-lock.json index a48aa06e229..1963fdcf200 100644 --- a/amplify/backend/function/getUserTokenBalance/src/package-lock.json +++ b/amplify/backend/function/getUserTokenBalance/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -99,13 +96,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/getUserTokenBalance/src/package.json b/amplify/backend/function/getUserTokenBalance/src/package.json index 10dd460a2f3..3424619985e 100644 --- a/amplify/backend/function/getUserTokenBalance/src/package.json +++ b/amplify/backend/function/getUserTokenBalance/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" diff --git a/amplify/backend/function/qaSSMtest/src/package-lock.json b/amplify/backend/function/qaSSMtest/src/package-lock.json index 3ef06972b8a..a91fd3c71bf 100644 --- a/amplify/backend/function/qaSSMtest/src/package-lock.json +++ b/amplify/backend/function/qaSSMtest/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" @@ -19,49 +19,46 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -99,13 +96,12 @@ } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/amplify/backend/function/qaSSMtest/src/package.json b/amplify/backend/function/qaSSMtest/src/package.json index 756a3eb740f..ec243142599 100644 --- a/amplify/backend/function/qaSSMtest/src/package.json +++ b/amplify/backend/function/qaSSMtest/src/package.json @@ -5,7 +5,7 @@ "main": "index.js", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "@colony/events": "3.0.0", "cross-fetch": "^4.0.0", "ethers": "^5.7.2" diff --git a/amplify/backend/function/updateContributorsWithReputation/src/package-lock.json b/amplify/backend/function/updateContributorsWithReputation/src/package-lock.json index b897db63402..db10dc029b5 100644 --- a/amplify/backend/function/updateContributorsWithReputation/src/package-lock.json +++ b/amplify/backend/function/updateContributorsWithReputation/src/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "cross-fetch": "^4.0.0", "decimal.js": "^10.2.1", "ethers": "^5.7.2" @@ -19,62 +19,58 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", - "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", + "dependencies": { + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, - "node_modules/@colony/colony-js/node_modules/@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "license": "GPL-3.0-only", + "node_modules/@colony/core": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, - "node_modules/@colony/colony-js/node_modules/@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "license": "GPL-3.0-only", + "node_modules/@colony/events": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0-next.1", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -734,7 +730,6 @@ "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -749,7 +744,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "license": "MIT", "engines": { "node": ">=8" } @@ -758,7 +752,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -772,8 +765,7 @@ "node_modules/array-timsort": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz", - "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==", - "license": "MIT" + "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==" }, "node_modules/base64-js": { "version": "1.5.1", @@ -792,8 +784,7 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/bech32": { "version": "1.1.4", @@ -803,7 +794,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -836,7 +826,6 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -846,7 +835,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -861,14 +849,12 @@ "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "license": "MIT" + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" }, @@ -880,7 +866,6 @@ "version": "2.9.2", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", - "license": "MIT", "engines": { "node": ">=6" }, @@ -892,7 +877,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "license": "ISC", "engines": { "node": ">= 10" } @@ -901,7 +885,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "license": "MIT", "engines": { "node": ">=0.8" } @@ -910,7 +893,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -921,14 +903,12 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "license": "MIT", "engines": { "node": ">=14" } @@ -937,7 +917,6 @@ "version": "4.2.5", "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.2.5.tgz", "integrity": "sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==", - "license": "MIT", "dependencies": { "array-timsort": "^1.0.3", "core-util-is": "^1.0.3", @@ -952,8 +931,7 @@ "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "license": "MIT" + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "node_modules/cross-fetch": { "version": "4.0.0", @@ -973,7 +951,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "license": "MIT", "dependencies": { "clone": "^1.0.2" }, @@ -985,7 +962,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/drange/-/drange-1.1.1.tgz", "integrity": "sha512-pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA==", - "license": "MIT", "engines": { "node": ">=4" } @@ -1010,14 +986,12 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "license": "MIT" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -1026,7 +1000,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -1085,7 +1058,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "license": "MIT", "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -1098,14 +1070,12 @@ "node_modules/fetch-retry": { "version": "5.0.6", "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-5.0.6.tgz", - "integrity": "sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ==", - "license": "MIT" + "integrity": "sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ==" }, "node_modules/figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -1120,7 +1090,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", "engines": { "node": ">=8" } @@ -1129,7 +1098,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz", "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==", - "license": "MIT", "engines": { "node": ">=8" } @@ -1155,7 +1123,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -1180,8 +1147,7 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "BSD-3-Clause" + ] }, "node_modules/inherits": { "version": "2.0.4", @@ -1191,7 +1157,6 @@ "version": "8.2.6", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", - "license": "MIT", "dependencies": { "ansi-escapes": "^4.2.1", "chalk": "^4.1.1", @@ -1217,7 +1182,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "license": "MIT", "engines": { "node": ">=8" } @@ -1226,7 +1190,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "license": "MIT", "engines": { "node": ">=8" } @@ -1235,7 +1198,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "license": "MIT", "engines": { "node": ">=10" }, @@ -1250,14 +1212,12 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -1273,7 +1233,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "license": "MIT", "engines": { "node": ">=6" } @@ -1289,8 +1248,7 @@ "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "license": "ISC" + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, "node_modules/node-fetch": { "version": "2.7.0", @@ -1315,7 +1273,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -1330,7 +1287,6 @@ "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "license": "MIT", "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -1353,7 +1309,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1362,7 +1317,6 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.5.3.tgz", "integrity": "sha512-U+5l2KrcMNOUPYvazA3h5ekF80FHTUG+87SEAmHZmolh1M+i/WyTCxVzmi+tidIa1tM4BSe8g2Y/D3loWDjj+w==", - "license": "MIT", "dependencies": { "drange": "^1.0.2", "ret": "^0.2.0" @@ -1375,7 +1329,6 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -1389,7 +1342,6 @@ "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", - "license": "MIT", "engines": { "node": ">=0.10" } @@ -1398,7 +1350,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "license": "MIT", "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -1411,7 +1362,6 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz", "integrity": "sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==", - "license": "MIT", "engines": { "node": ">=4" } @@ -1420,7 +1370,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -1429,7 +1378,6 @@ "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" } @@ -1451,14 +1399,12 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "license": "MIT" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/scrypt-js": { "version": "3.0.1", @@ -1467,14 +1413,12 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "license": "ISC" + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -1483,7 +1427,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1497,7 +1440,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1509,7 +1451,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -1520,14 +1461,12 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "license": "MIT" + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "license": "MIT", "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -1543,14 +1482,12 @@ "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" }, "node_modules/type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -1562,7 +1499,6 @@ "version": "5.7.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", - "license": "Apache-2.0", "peer": true, "bin": { "tsc": "bin/tsc", @@ -1576,7 +1512,6 @@ "version": "3.8.9", "resolved": "https://registry.npmjs.org/typia/-/typia-3.8.9.tgz", "integrity": "sha512-yvQ67nhtzme+rnEUZfSOIgxBOHYrrQ3WBU1J4SrAhI3ntBhSelYwGiJkeaCvqchzK6O1RoIs3kCBS4XHIlp2NA==", - "license": "MIT", "dependencies": { "commander": "^10.0.0", "comment-json": "^4.2.3", @@ -1593,14 +1528,12 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "license": "MIT", "dependencies": { "defaults": "^1.0.3" } @@ -1623,7 +1556,6 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1655,37 +1587,35 @@ }, "dependencies": { "@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "requires": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" - }, - "dependencies": { - "@colony/core": { - "version": "3.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0-next.1.tgz", - "integrity": "sha512-40F2Ok9FFKVHpAfUK8qJ/leOqUU7u79pKOjHZFDjL6FPIl5gHokLeDuZBlyHA8MOHxHaefxDRgXUZ1fbqyWh0Q==", - "requires": {} - }, - "@colony/events": { - "version": "4.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0-next.1.tgz", - "integrity": "sha512-Mcy8YMKzyFxH5QHBTPlPMmP3lm5S8ITNr2vv2UUy9iQNT7wGMqc2kqZtwtuN5KA0nW1HwvBkgfaFmiKjR5hlIg==", - "requires": { - "@colony/core": "^3.0.0-next.1", - "fetch-retry": "^5.0.4", - "typia": "^3.8.3" - } - } + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" + } + }, + "@colony/core": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", + "requires": {} + }, + "@colony/events": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", + "requires": { + "@colony/core": "3.1.0", + "fetch-retry": "^5.0.4", + "typia": "^3.8.3" } }, "@colony/tokens": { - "version": "1.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0-next.1.tgz", - "integrity": "sha512-vP4SD4lv4o3H160uE1PgWKt1d1zCd7H9W5lAu+XzKNJvd+OVVL5OSxu7XxVpo978tqQW1EgzWLNTbtP/Vl2oJQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "requires": {} }, "@ethersproject/abi": { diff --git a/amplify/backend/function/updateContributorsWithReputation/src/package.json b/amplify/backend/function/updateContributorsWithReputation/src/package.json index 415c6643b55..a614d5c9b9a 100644 --- a/amplify/backend/function/updateContributorsWithReputation/src/package.json +++ b/amplify/backend/function/updateContributorsWithReputation/src/package.json @@ -8,7 +8,7 @@ "@types/aws-lambda": "^8.10.92" }, "dependencies": { - "@colony/colony-js": "^8.0.0-next.1", + "@colony/colony-js": "^8.1.0", "cross-fetch": "^4.0.0", "decimal.js": "^10.2.1", "ethers": "^5.7.2" diff --git a/docker/colony-cdapp-dev-env-block-ingestor b/docker/colony-cdapp-dev-env-block-ingestor index 99bb915455f..b610a0ea488 100644 --- a/docker/colony-cdapp-dev-env-block-ingestor +++ b/docker/colony-cdapp-dev-env-block-ingestor @@ -1,6 +1,6 @@ FROM colony-cdapp-dev-env/base:latest -ENV BLOCK_INGESTOR_HASH=61747477aa9fc21fbe0c873311655c72e4bf54ea +ENV BLOCK_INGESTOR_HASH=73e7514bf38043e91a458a3d195a12427c9f24fd # Declare volumes to set up metadata VOLUME [ "/colonyCDapp/amplify/mock-data" ] diff --git a/docker/colony-cdapp-dev-env-network b/docker/colony-cdapp-dev-env-network index 558ee0a8321..18d4fd28fd4 100644 --- a/docker/colony-cdapp-dev-env-network +++ b/docker/colony-cdapp-dev-env-network @@ -1,6 +1,6 @@ FROM colony-cdapp-dev-env/base:latest -ENV NETWORK_HASH=89015a77c6fba5ac4fbbdcb0c806c0b66807fc73 +ENV NETWORK_HASH=1653b8bbd9d769aeb0560dd36cbfb4f489ca91ec # Declare volumes to set up metadata VOLUME [ "/colonyCDapp/amplify/mock-data" ] diff --git a/docker/colony-cdapp-dev-env-proxy-block-ingestor b/docker/colony-cdapp-dev-env-proxy-block-ingestor index 37c213eb675..e678100cf11 100644 --- a/docker/colony-cdapp-dev-env-proxy-block-ingestor +++ b/docker/colony-cdapp-dev-env-proxy-block-ingestor @@ -1,7 +1,7 @@ FROM colony-cdapp-dev-env/base:latest # @TODO maybe add a PROXY_BLOCK_INGESTOR_HASH and fallback to BLOCK_INGESTOR_HASH -ENV BLOCK_INGESTOR_HASH=61747477aa9fc21fbe0c873311655c72e4bf54ea +ENV BLOCK_INGESTOR_HASH=73e7514bf38043e91a458a3d195a12427c9f24fd ENV CHAIN_RPC_ENDPOINTS='["http://network-contracts-remote:8545", "http://network-contracts-remote-2:8545"]' ENV STATS_PORTS='["10002", "10003"]' diff --git a/package-lock.json b/package-lock.json index 6a3980cec10..5f7cda55668 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,10 +11,10 @@ "dependencies": { "@apollo/client": "3.7.14", "@colony/abis": "^1.6.0", - "@colony/colony-js": "^8.0.0-next.1", - "@colony/events": "^4.0.0-next.1", + "@colony/colony-js": "^8.1.0", + "@colony/events": "^4.1.0", "@colony/redux-promise-listener": "^1.2.0", - "@colony/sdk": "^3.1.1", + "@colony/sdk": "^3.2.0", "@colony/unicode-confusables-noascii": "^0.1.2", "@hookform/resolvers": "^2.9.10", "@magicbell/react-headless": "^5.0.1", @@ -2753,31 +2753,29 @@ } }, "node_modules/@colony/colony-js": { - "version": "8.0.0-next.1", - "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.0.0-next.1.tgz", - "integrity": "sha512-up/4KT2vrpPxy1dBTIccQVCAKmoCwPvpFzQ2+NWsp69hY+WV+jHxhFpynFuOfhEOgMzqiESwicwDimQLHDXr5Q==", - "license": "GPL-3.0-only", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@colony/colony-js/-/colony-js-8.1.0.tgz", + "integrity": "sha512-GYMVTS4GtS4w8IAKWhjMn8k3yjAvFmwndMk6Q9lFGiUJclB+YtMPpwfXs9D+U1vVwMG2ybf9LCF0K2JVLFZqtQ==", "dependencies": { - "@colony/core": "^3.0.0-next.1", - "@colony/events": "^4.0.0-next.1", - "@colony/tokens": "^1.0.0-next.1" + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/core": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.0.0.tgz", - "integrity": "sha512-NtjA4HtMl1uA9jrjcRpMItJVotJsFqgOngZ7Z7l/8S/kRWA1yMY17VsjkohEkRvnyAeoBgD0mdtTEZwGeqXvng==", - "license": "GPL-3.0-only", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@colony/core/-/core-3.1.0.tgz", + "integrity": "sha512-VcoXSFd6FGeL4yNAAnBS3gPmVhV4uiiJp5gKIMGAQf0Wt1iqM0k+1m/BWc+ydP58Rx7A2eOCaE8TghtJYiXsFQ==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -2800,18 +2798,17 @@ } }, "node_modules/@colony/events": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.0.0.tgz", - "integrity": "sha512-sPjL+1ayeyXC7qr++tmNBWdaxVmsNPnt4R4tL8ch/dz8Ni65f4cE95wiWSmh0Sefoa9J4gZwYeXFvvYqyMLCEA==", - "license": "GPL-3.0-only", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@colony/events/-/events-4.1.0.tgz", + "integrity": "sha512-9bIQUSIo/7o817ZpQ0H86Ar3Fxwdj05vfW0Jc3sUU6bhDC7c9MT7DHTRv1uN+kEcZVtJz4KabWcIUARZrq0AOA==", "dependencies": { - "@colony/core": "^3.0.0", + "@colony/core": "3.1.0", "fetch-retry": "^5.0.4", "typia": "^3.8.3" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" @@ -2827,33 +2824,31 @@ } }, "node_modules/@colony/sdk": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@colony/sdk/-/sdk-3.1.1.tgz", - "integrity": "sha512-vo2fzAaBe6yV4FVY+OuyBYvxlpSybVRBwL94WLqNv6gqLnvVQbk1irPJfBbc+y6uBqjUnOrLkKyrpKMAALgx2A==", - "license": "GPL-3.0-only", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@colony/sdk/-/sdk-3.2.0.tgz", + "integrity": "sha512-hDgBDfSUpQqsged2zsDnITHrcxWF7qWJS7IUtfaFKYsiDlI9QKmEODxqX9KNbvxN6TLs9zC1slnpXEiNGboHsg==", "dependencies": { - "@colony/core": "^3.0.0", - "@colony/events": "^4.0.0", - "@colony/tokens": "^1.0.0", + "@colony/core": "3.1.0", + "@colony/events": "4.1.0", + "@colony/tokens": "1.1.0", "@ethersproject/abstract-provider": "^5.7.0", "abitype": "^1.0.6" }, "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" } }, "node_modules/@colony/tokens": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.0.0.tgz", - "integrity": "sha512-veyUSixcToWGzPgcOb907QbnnJdyCixZTkz6q9U1YAtrUwpUNp7xyajF7ef+HuNbUDMA+owa4P2PLpJBaBoiMg==", - "license": "GPL-3.0-only", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@colony/tokens/-/tokens-1.1.0.tgz", + "integrity": "sha512-gIEX0fMbJv3HXWucqaS+beIPJf9YGz5GY0npy3+mTdCCxNkoQM1m9LT0gjP6T8NyaDxDvju3URDtB083qPLNaA==", "engines": { - "node": "^16 || ^18 || ^20", - "pnpm": "^8" + "node": "^18 || ^20 || ^22", + "pnpm": "^10" }, "peerDependencies": { "ethers": "^5.1.3" diff --git a/package.json b/package.json index 3a7d24bcccb..3e1c13db966 100644 --- a/package.json +++ b/package.json @@ -159,10 +159,10 @@ "dependencies": { "@apollo/client": "3.7.14", "@colony/abis": "^1.6.0", - "@colony/colony-js": "^8.0.0-next.1", - "@colony/events": "^4.0.0-next.1", + "@colony/colony-js": "^8.1.0", + "@colony/events": "^4.1.0", "@colony/redux-promise-listener": "^1.2.0", - "@colony/sdk": "^3.1.1", + "@colony/sdk": "^3.2.0", "@colony/unicode-confusables-noascii": "^0.1.2", "@hookform/resolvers": "^2.9.10", "@magicbell/react-headless": "^5.0.1", diff --git a/src/components/v5/common/ActionSidebar/hooks/useFilterChainSelectField.ts b/src/components/v5/common/ActionSidebar/hooks/useFilterChainSelectField.ts index 2e93bfba787..236fed0a599 100644 --- a/src/components/v5/common/ActionSidebar/hooks/useFilterChainSelectField.ts +++ b/src/components/v5/common/ActionSidebar/hooks/useFilterChainSelectField.ts @@ -1,3 +1,4 @@ +import { DEFAULT_NETWORK_INFO } from '~constants'; import { useDeployedChainIds } from '~hooks/proxyColonies/useDeployedChainIds.ts'; import { type SearchSelectOption, @@ -21,9 +22,15 @@ export const useFilterChainSelectField = () => { filterFn: (deployedProxyColony) => deployedProxyColony?.isActive, }); - const filterFn = ({ value: chainId }: SearchSelectOption) => - isRemoveOperation + const filterFn = ({ value: chainId }: SearchSelectOption) => { + // remove the default chain from the select + if (chainId === DEFAULT_NETWORK_INFO.chainId) { + return false; + } + + return isRemoveOperation ? activeProxyColoniesChainIds.includes(chainId.toString()) : !activeProxyColoniesChainIds.includes(chainId.toString()); + }; return filterFn; }; diff --git a/src/components/v5/common/ActionSidebar/partials/AmountField/AmountField.tsx b/src/components/v5/common/ActionSidebar/partials/AmountField/AmountField.tsx index eb47844be4d..8b4ab996e5e 100644 --- a/src/components/v5/common/ActionSidebar/partials/AmountField/AmountField.tsx +++ b/src/components/v5/common/ActionSidebar/partials/AmountField/AmountField.tsx @@ -48,6 +48,7 @@ const AmountField: FC = ({ placeholder || formatText({ id: 'actionSidebar.enterAmount' }); const { trigger } = useFormContext(); + const { field, fieldState: { error }, @@ -62,6 +63,7 @@ const AmountField: FC = ({ }); const isError = !!error || !!tokenAddressError; const { colony } = useColonyContext(); + const [ isTokenSelectVisible, { toggle: toggleTokenSelect, registerContainerRef }, @@ -99,6 +101,12 @@ const AmountField: FC = ({ setValue(formattedValue); }; + useEffect(() => { + if (selectedToken?.tokenAddress) { + tokenAddressController.onChange(selectedToken.tokenAddress); + } + }, [selectedToken?.tokenAddress]); + const handleTokenSelect = (selectedTokenAddress: string) => { tokenAddressController.onChange(selectedTokenAddress); if (value) { diff --git a/src/components/v5/common/ActionSidebar/partials/AmountField/hooks.ts b/src/components/v5/common/ActionSidebar/partials/AmountField/hooks.ts index 8b2ce3cb97f..f45f7cb60ad 100644 --- a/src/components/v5/common/ActionSidebar/partials/AmountField/hooks.ts +++ b/src/components/v5/common/ActionSidebar/partials/AmountField/hooks.ts @@ -1,28 +1,27 @@ import { type FormatNumeralOptions } from 'cleave-zen'; import { useMemo } from 'react'; +import { useFormContext } from 'react-hook-form'; import { useColonyContext } from '~context/ColonyContext/ColonyContext.ts'; import { notNull } from '~utils/arrays/index.ts'; -import { - getSelectedToken, - getTokenDecimalsWithFallback, -} from '~utils/tokens.ts'; +import { getTokenDecimalsWithFallback } from '~utils/tokens.ts'; +import { CHAIN_FIELD_NAME } from '~v5/common/ActionSidebar/consts.ts'; export const useAmountField = (selectedTokenAddress: string | undefined) => { - const { - colony, - colony: { nativeToken }, - } = useColonyContext(); + const { colony } = useColonyContext(); + const { watch } = useFormContext(); + const chainId = watch(CHAIN_FIELD_NAME); const colonyTokens = colony.tokens?.items .filter(notNull) + .filter((token) => token.token.chainMetadata.chainId === chainId) .map((colonyToken) => colonyToken.token) || []; - const selectedToken = getSelectedToken( - colony, - selectedTokenAddress || nativeToken.tokenAddress, - ); + const selectedToken = + colonyTokens.find( + (token) => token?.tokenAddress === selectedTokenAddress, + ) || colonyTokens[0]; const formattingOptions: FormatNumeralOptions = useMemo( () => ({ diff --git a/src/components/v5/common/ActionSidebar/partials/ChainSelect/hooks.ts b/src/components/v5/common/ActionSidebar/partials/ChainSelect/hooks.ts index 7cdbcb696b7..7763f567a28 100644 --- a/src/components/v5/common/ActionSidebar/partials/ChainSelect/hooks.ts +++ b/src/components/v5/common/ActionSidebar/partials/ChainSelect/hooks.ts @@ -1,15 +1,24 @@ import { useMemo } from 'react'; +import { DEFAULT_NETWORK_INFO } from '~constants'; import { SUPPORTED_CHAINS } from '~constants/proxyColonies.ts'; import { useGetSupportedChainsQuery } from '~gql'; import GanacheIcon from '~icons/GanacheIcon.tsx'; import { notNull } from '~utils/arrays/index.ts'; +const DEFAULT_NETWORK_OPTION = { + icon: DEFAULT_NETWORK_INFO.icon ?? GanacheIcon, + isDisabled: false, + value: DEFAULT_NETWORK_INFO.chainId, + label: DEFAULT_NETWORK_INFO.shortName, +}; + +// This also gets the default chain and inserts it as the first option export const useChainOptions = (filterOptionsFn) => { const { data } = useGetSupportedChainsQuery(); const chainOptions = useMemo(() => { - return (data?.listSupportedChains?.items ?? []) + const supportedChainOptions = (data?.listSupportedChains?.items ?? []) .map((chain) => { const chainConfig = SUPPORTED_CHAINS.find( (supportedChain) => supportedChain.chainId === chain?.id, @@ -25,8 +34,11 @@ export const useChainOptions = (filterOptionsFn) => { label: chainConfig.shortName, }; }) - .filter(notNull) - .filter((option) => filterOptionsFn && filterOptionsFn(option)); + .filter(notNull); + + return [DEFAULT_NETWORK_OPTION, ...supportedChainOptions].filter( + (option) => (filterOptionsFn ? filterOptionsFn(option) : true), + ); }, [data, filterOptionsFn]); return chainOptions; diff --git a/src/components/v5/common/ActionSidebar/partials/TeamsSelect/TeamsSelect.tsx b/src/components/v5/common/ActionSidebar/partials/TeamsSelect/TeamsSelect.tsx index dc4ec22cdf8..721ec33f374 100644 --- a/src/components/v5/common/ActionSidebar/partials/TeamsSelect/TeamsSelect.tsx +++ b/src/components/v5/common/ActionSidebar/partials/TeamsSelect/TeamsSelect.tsx @@ -16,6 +16,7 @@ import { type TeamSelectProps } from './types.ts'; const displayName = 'v5.common.ActionsContent.partials.TeamsSelect'; const TeamsSelect: FC = ({ + className, name, readonly: readonlyProp, filterOptionsFn, @@ -59,7 +60,7 @@ const TeamsSelect: FC = ({ }, [field.value, name, resetField, selectedOption]); return ( -
+
{readonly || readonlyProp ? ( ) => boolean; diff --git a/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/SimplePaymentForm.tsx b/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/SimplePaymentForm.tsx index aaf90b98718..8cc1a4b7bf3 100644 --- a/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/SimplePaymentForm.tsx +++ b/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/SimplePaymentForm.tsx @@ -4,9 +4,11 @@ import { useFormContext } from 'react-hook-form'; import { formatText } from '~utils/intl.ts'; import ActionFormRow from '~v5/common/ActionFormRow/index.ts'; +import { CHAIN_FIELD_NAME } from '~v5/common/ActionSidebar/consts.ts'; import useHasNoDecisionMethods from '~v5/common/ActionSidebar/hooks/permissions/useHasNoDecisionMethods.ts'; import useFilterCreatedInField from '~v5/common/ActionSidebar/hooks/useFilterCreatedInField.ts'; import AmountRow from '~v5/common/ActionSidebar/partials/AmountRow/AmountRow.tsx'; +import ChainSelect from '~v5/common/ActionSidebar/partials/ChainSelect/ChainSelect.tsx'; import CreatedIn from '~v5/common/ActionSidebar/partials/CreatedIn/CreatedIn.tsx'; import DecisionMethodField from '~v5/common/ActionSidebar/partials/DecisionMethodField/index.ts'; import Description from '~v5/common/ActionSidebar/partials/Description/index.ts'; @@ -14,7 +16,7 @@ import TeamsSelect from '~v5/common/ActionSidebar/partials/TeamsSelect/index.ts' import UserSelect from '~v5/common/ActionSidebar/partials/UserSelect/index.ts'; import { type ActionFormBaseProps } from '~v5/common/ActionSidebar/types.ts'; -import { useSimplePayment } from './hooks.ts'; +import { useActiveChainsFilter, useSimplePayment } from './hooks.ts'; const displayName = 'v5.common.ActionSidebar.partials.SimplePaymentForm'; @@ -27,6 +29,7 @@ const SimplePaymentForm: FC = ({ getFormOptions }) => { const selectedTeam = watch('from'); const createdInFilterFn = useFilterCreatedInField('from'); + const activeChainsFilterFn = useActiveChainsFilter(); return ( <> @@ -42,8 +45,20 @@ const SimplePaymentForm: FC = ({ getFormOptions }) => { }} title={formatText({ id: 'actionSidebar.from' })} isDisabled={hasNoDecisionMethods} + isMultiLine > - +
+ +

{formatText({ id: 'on' })}

+ +
{ + const activeProxyColoniesChainIds = useDeployedChainIds({ + filterFn: (deployedProxyColony) => deployedProxyColony?.isActive, + }); + + const filterFn = ({ value: chainId }: SearchSelectOption) => { + // keep the default chain from the select + if (chainId === DEFAULT_NETWORK_INFO.chainId) { + return true; + } + + return activeProxyColoniesChainIds.includes(chainId.toString()); + }; + return filterFn; +}; + export const useValidationSchema = (networkInverseFee: string | undefined) => { const { colony } = useColonyContext(); const { watch } = useFormContext(); @@ -81,6 +104,9 @@ export const useValidationSchema = (networkInverseFee: string | undefined) => { ), ), createdIn: number().defined(), + [CHAIN_FIELD_NAME]: string().required( + formatText({ id: 'errors.chain.required' }), + ), recipient: string().address().required(), from: number().required(), decisionMethod: string().defined(), @@ -136,6 +162,7 @@ export const useSimplePayment = ( defaultValues: useMemo>( () => ({ createdIn: Id.RootDomain, + chain: DEFAULT_NETWORK_INFO.chainId, payments: [], tokenAddress: colony.nativeToken.tokenAddress, }), diff --git a/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/utils.tsx b/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/utils.tsx index 8df4dc83ab2..a950fbed74f 100644 --- a/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/utils.tsx +++ b/src/components/v5/common/ActionSidebar/partials/forms/SimplePaymentForm/utils.tsx @@ -57,6 +57,7 @@ export const getSimplePaymentPayload = ( tokenAddress, recipient, decisionMethod, + chain, } = values; const fromDomainId = Number(from); const createdInDomainId = Number(createdIn); @@ -65,6 +66,7 @@ export const getSimplePaymentPayload = ( colonyName: colony.name, colonyAddress: colony.colonyAddress, domainId: fromDomainId, + chainId: chain, payments: [ getPaymentPayload({ colony, diff --git a/src/components/v5/common/CompletedAction/partials/SimplePayment/SimplePayment.tsx b/src/components/v5/common/CompletedAction/partials/SimplePayment/SimplePayment.tsx index 3dee0c23be4..fd34b7108ee 100644 --- a/src/components/v5/common/CompletedAction/partials/SimplePayment/SimplePayment.tsx +++ b/src/components/v5/common/CompletedAction/partials/SimplePayment/SimplePayment.tsx @@ -1,17 +1,20 @@ -import { UserFocus } from '@phosphor-icons/react'; +import { UserFocus, UsersThree } from '@phosphor-icons/react'; import React from 'react'; import { defineMessages } from 'react-intl'; import { ADDRESS_ZERO } from '~constants'; import { Action } from '~constants/actions.ts'; +import { useColonyContext } from '~context/ColonyContext/ColonyContext.ts'; import { useAmountLessFee } from '~hooks/useAmountLessFee.ts'; import useUserByAddress from '~hooks/useUserByAddress.ts'; import { type ColonyAction } from '~types/graphql.ts'; import { convertToDecimal } from '~utils/convertToDecimal.ts'; import { formatText } from '~utils/intl.ts'; +import { findSupportedChain } from '~utils/proxyColonies.ts'; import { splitWalletAddress } from '~utils/splitWalletAddress.ts'; import { getNumeralTokenAmount, + getSelectedToken, getTokenDecimalsWithFallback, } from '~utils/tokens.ts'; import { @@ -26,6 +29,8 @@ import { TOKEN_FIELD_NAME, } from '~v5/common/ActionSidebar/consts.ts'; import { useDecisionMethod } from '~v5/common/CompletedAction/hooks.ts'; +import ChainBadge from '~v5/common/Pills/ChainBadge/ChainBadge.tsx'; +import TeamBadge from '~v5/common/Pills/TeamBadge/TeamBadge.tsx'; import UserInfoPopover from '~v5/shared/UserInfoPopover/index.ts'; import UserPopover from '~v5/shared/UserPopover/index.ts'; @@ -42,7 +47,6 @@ import { CreatedInRow, DecisionMethodRow, DescriptionRow, - TeamFromRow, } from '../rows/index.ts'; const displayName = 'v5.common.CompletedAction.partials.SimplePayment'; @@ -60,9 +64,14 @@ const MSG = defineMessages({ id: `${displayName}.subtitle`, defaultMessage: 'Pay {recipient} {amount} {token} by {user}', }, + unknownChain: { + id: `${displayName}.unknownChain`, + defaultMessage: 'Unknown', + }, }); const SimplePayment = ({ action }: SimplePaymentProps) => { + const { colony } = useColonyContext(); const decisionMethod = useDecisionMethod(action); const { customTitle = formatText(MSG.defaultTitle) } = action?.metadata || {}; const { @@ -71,16 +80,24 @@ const SimplePayment = ({ action }: SimplePaymentProps) => { initiatorUser, recipientAddress: actionRecipientAddress = '', recipientUser: actionRecipientUser, - token, + tokenAddress, + token: actionToken, transactionHash, fromDomain, isMotion, motionData, annotation, + targetChainId, } = action; + // @NOTE the chain's native token isn't in the DB but it's in the colony + const tokenFromColony = tokenAddress + ? getSelectedToken(colony, tokenAddress) + : undefined; + const token = actionToken ?? tokenFromColony; const amountLessFee = useAmountLessFee(amount, networkFee); + const chainInfo = findSupportedChain(targetChainId); const formattedAmount = getNumeralTokenAmount(amountLessFee, token?.decimals); const convertedValue = convertToDecimal( amountLessFee, @@ -141,11 +158,29 @@ const SimplePayment = ({ action }: SimplePaymentProps) => { - {action.fromDomain?.metadata && ( - + +

+ {formatText({ id: 'on' })} +

+ +
+ } /> )} { id: 'actionSidebar.tooltip.simplePayment.recipient', })} /> - + diff --git a/src/constants/abis.ts b/src/constants/abis.ts index 95ebe9094c8..fb7d855e741 100644 --- a/src/constants/abis.ts +++ b/src/constants/abis.ts @@ -2068,12 +2068,12 @@ export const colonyAbi = [ ], stateMutability: 'pure', }, -] as const; +] as const export const colonyAddress = - '0x777760996135F0791E2e1a74aFAA060711197778' as const; + '0x777760996135F0791E2e1a74aFAA060711197778' as const -export const colonyConfig = { address: colonyAddress, abi: colonyAbi } as const; +export const colonyConfig = { address: colonyAddress, abi: colonyAbi } as const ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ColonyFunding @@ -3874,15 +3874,15 @@ export const colonyFundingAbi = [ outputs: [{ name: '', internalType: 'bool', type: 'bool' }], stateMutability: 'view', }, -] as const; +] as const export const colonyFundingAddress = - '0x777760996135f0791E2e1a74aFAa060711197779' as const; + '0x777760996135f0791E2e1a74aFAa060711197779' as const export const colonyFundingConfig = { address: colonyFundingAddress, abi: colonyFundingAbi, -} as const; +} as const ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ColonyNetwork @@ -4754,15 +4754,363 @@ export const colonyNetworkAbi = [ outputs: [{ name: '', internalType: 'bool', type: 'bool' }], stateMutability: 'view', }, -] as const; +] as const export const colonyNetworkAddress = - '0x777760996135F0791E2e1a74aFAa060711197777' as const; + '0x777760996135F0791E2e1a74aFAa060711197777' as const export const colonyNetworkConfig = { address: colonyNetworkAddress, abi: colonyNetworkAbi, -} as const; +} as const + +////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// OneTxPayment +////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +export const oneTxPaymentAbi = [ + { type: 'event', anonymous: false, inputs: [], name: 'ExtensionInitialised' }, + { + type: 'event', + anonymous: false, + inputs: [ + { + name: 'authority', + internalType: 'address', + type: 'address', + indexed: true, + }, + ], + name: 'LogSetAuthority', + }, + { + type: 'event', + anonymous: false, + inputs: [ + { + name: 'owner', + internalType: 'address', + type: 'address', + indexed: true, + }, + ], + name: 'LogSetOwner', + }, + { + type: 'event', + anonymous: false, + inputs: [ + { + name: 'userAddress', + internalType: 'address', + type: 'address', + indexed: false, + }, + { + name: 'relayerAddress', + internalType: 'address payable', + type: 'address', + indexed: false, + }, + { name: 'payload', internalType: 'bytes', type: 'bytes', indexed: false }, + ], + name: 'MetaTransactionExecuted', + }, + { + type: 'event', + anonymous: false, + inputs: [ + { + name: 'agent', + internalType: 'address', + type: 'address', + indexed: false, + }, + { + name: 'fundamentalId', + internalType: 'uint256', + type: 'uint256', + indexed: false, + }, + { + name: 'nPayouts', + internalType: 'uint256', + type: 'uint256', + indexed: false, + }, + ], + name: 'OneTxPaymentMade', + }, + { + type: 'function', + inputs: [], + name: 'authority', + outputs: [ + { name: '', internalType: 'contract DSAuthority', type: 'address' }, + ], + stateMutability: 'view', + }, + { + type: 'function', + inputs: [{ name: '_deprecated', internalType: 'bool', type: 'bool' }], + name: 'deprecate', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [ + { name: '_user', internalType: 'address', type: 'address' }, + { name: '_payload', internalType: 'bytes', type: 'bytes' }, + { name: '_sigR', internalType: 'bytes32', type: 'bytes32' }, + { name: '_sigS', internalType: 'bytes32', type: 'bytes32' }, + { name: '_sigV', internalType: 'uint8', type: 'uint8' }, + ], + name: 'executeMetaTransaction', + outputs: [{ name: 'returnData', internalType: 'bytes', type: 'bytes' }], + stateMutability: 'payable', + }, + { + type: 'function', + inputs: [], + name: 'finishUpgrade', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [{ name: '_sig', internalType: 'bytes4', type: 'bytes4' }], + name: 'getCapabilityRoles', + outputs: [{ name: '_roles', internalType: 'bytes32', type: 'bytes32' }], + stateMutability: 'pure', + }, + { + type: 'function', + inputs: [], + name: 'getColony', + outputs: [{ name: '', internalType: 'address', type: 'address' }], + stateMutability: 'view', + }, + { + type: 'function', + inputs: [], + name: 'getDeprecated', + outputs: [{ name: '', internalType: 'bool', type: 'bool' }], + stateMutability: 'view', + }, + { + type: 'function', + inputs: [{ name: '_user', internalType: 'address', type: 'address' }], + name: 'getMetatransactionNonce', + outputs: [{ name: 'nonce', internalType: 'uint256', type: 'uint256' }], + stateMutability: 'view', + }, + { + type: 'function', + inputs: [], + name: 'identifier', + outputs: [ + { name: '_identifier', internalType: 'bytes32', type: 'bytes32' }, + ], + stateMutability: 'pure', + }, + { + type: 'function', + inputs: [{ name: '_colony', internalType: 'address', type: 'address' }], + name: 'install', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [ + { name: '_permissionDomainId', internalType: 'uint256', type: 'uint256' }, + { name: '_childSkillIndex', internalType: 'uint256', type: 'uint256' }, + { + name: '_callerPermissionDomainId', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_callerChildSkillIndex', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_workers', + internalType: 'address payable[]', + type: 'address[]', + }, + { name: '_chainIds', internalType: 'uint256[]', type: 'uint256[]' }, + { name: '_tokens', internalType: 'address[]', type: 'address[]' }, + { name: '_amounts', internalType: 'uint256[]', type: 'uint256[]' }, + { name: '_domainId', internalType: 'uint256', type: 'uint256' }, + { name: '_skillId', internalType: 'uint256', type: 'uint256' }, + ], + name: 'makePayment', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [ + { name: '_permissionDomainId', internalType: 'uint256', type: 'uint256' }, + { name: '_childSkillIndex', internalType: 'uint256', type: 'uint256' }, + { + name: '_callerPermissionDomainId', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_callerChildSkillIndex', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_workers', + internalType: 'address payable[]', + type: 'address[]', + }, + { name: '_tokens', internalType: 'address[]', type: 'address[]' }, + { name: '_amounts', internalType: 'uint256[]', type: 'uint256[]' }, + { name: '_domainId', internalType: 'uint256', type: 'uint256' }, + { name: '_skillId', internalType: 'uint256', type: 'uint256' }, + ], + name: 'makePayment', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [ + { name: '_permissionDomainId', internalType: 'uint256', type: 'uint256' }, + { name: '_childSkillIndex', internalType: 'uint256', type: 'uint256' }, + { + name: '_callerPermissionDomainId', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_callerChildSkillIndex', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_workers', + internalType: 'address payable[]', + type: 'address[]', + }, + { name: '_tokens', internalType: 'address[]', type: 'address[]' }, + { name: '_amounts', internalType: 'uint256[]', type: 'uint256[]' }, + { name: '_domainId', internalType: 'uint256', type: 'uint256' }, + { name: '_skillId', internalType: 'uint256', type: 'uint256' }, + ], + name: 'makePaymentFundedFromDomain', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [ + { name: '_permissionDomainId', internalType: 'uint256', type: 'uint256' }, + { name: '_childSkillIndex', internalType: 'uint256', type: 'uint256' }, + { + name: '_callerPermissionDomainId', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_callerChildSkillIndex', + internalType: 'uint256', + type: 'uint256', + }, + { + name: '_workers', + internalType: 'address payable[]', + type: 'address[]', + }, + { name: '_chainIds', internalType: 'uint256[]', type: 'uint256[]' }, + { name: '_tokens', internalType: 'address[]', type: 'address[]' }, + { name: '_amounts', internalType: 'uint256[]', type: 'uint256[]' }, + { name: '_domainId', internalType: 'uint256', type: 'uint256' }, + { name: '_skillId', internalType: 'uint256', type: 'uint256' }, + ], + name: 'makePaymentFundedFromDomain', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [{ name: 'data', internalType: 'bytes[]', type: 'bytes[]' }], + name: 'multicall', + outputs: [{ name: 'results', internalType: 'bytes[]', type: 'bytes[]' }], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [], + name: 'owner', + outputs: [{ name: '', internalType: 'address', type: 'address' }], + stateMutability: 'view', + }, + { + type: 'function', + inputs: [ + { + name: 'authority_', + internalType: 'contract DSAuthority', + type: 'address', + }, + ], + name: 'setAuthority', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [{ name: 'owner_', internalType: 'address', type: 'address' }], + name: 'setOwner', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [], + name: 'uninstall', + outputs: [], + stateMutability: 'nonpayable', + }, + { + type: 'function', + inputs: [ + { name: '_user', internalType: 'address', type: 'address' }, + { name: '_nonce', internalType: 'uint256', type: 'uint256' }, + { name: '_chainId', internalType: 'uint256', type: 'uint256' }, + { name: '_payload', internalType: 'bytes', type: 'bytes' }, + { name: '_sigR', internalType: 'bytes32', type: 'bytes32' }, + { name: '_sigS', internalType: 'bytes32', type: 'bytes32' }, + { name: '_sigV', internalType: 'uint8', type: 'uint8' }, + ], + name: 'verify', + outputs: [{ name: '', internalType: 'bool', type: 'bool' }], + stateMutability: 'view', + }, + { + type: 'function', + inputs: [], + name: 'version', + outputs: [{ name: '_version', internalType: 'uint256', type: 'uint256' }], + stateMutability: 'pure', + }, +] as const + +export const oneTxPaymentAddress = + '0x777760996135f0791e2E1A74AFaA060711197782' as const + +export const oneTxPaymentConfig = { + address: oneTxPaymentAddress, + abi: oneTxPaymentAbi, +} as const ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // ProxyColony @@ -4981,12 +5329,12 @@ export const proxyColonyAbi = [ outputs: [{ name: '', internalType: 'bool', type: 'bool' }], stateMutability: 'view', }, -] as const; +] as const export const proxyColonyAddress = - '0x777760996135F0791E2E1a74AFaA060711197781' as const; + '0x777760996135F0791E2E1a74AFaA060711197781' as const export const proxyColonyConfig = { address: proxyColonyAddress, abi: proxyColonyAbi, -} as const; +} as const diff --git a/src/constants/proxyColonies.ts b/src/constants/proxyColonies.ts index 6d3e0b1fb30..54a381bcfce 100644 --- a/src/constants/proxyColonies.ts +++ b/src/constants/proxyColonies.ts @@ -1,14 +1,20 @@ import { + ARBITRUM_NETWORK, POLYGON_NETWORK, + ARBITRUM_SEPOLIA_NETWORK, AMOY_NETWORK, + GANACHE_NETWORK, GANACHE_NETWORK_1, GANACHE_NETWORK_2, type NetworkInfo, } from '~constants'; export const SUPPORTED_CHAINS: NetworkInfo[] = [ + ARBITRUM_NETWORK, POLYGON_NETWORK, + ARBITRUM_SEPOLIA_NETWORK, AMOY_NETWORK, + GANACHE_NETWORK, GANACHE_NETWORK_1, GANACHE_NETWORK_2, ]; diff --git a/src/i18n/en.json b/src/i18n/en.json index 0c80fa8f21a..351d9d58b3b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -210,7 +210,6 @@ "learn.more": "Learn more", "learnMoreComponent.helpAndGuidance": "Need help and guidance? Visit our docs", "loader.noMoreResults": "No more results", - "transaction.cancel.title": "Transaction cancelled", "transaction.cancel.description": "Transaction cancelled by user", "transaction.debug.description": "DEBUG: context: {context} methodName: {methodName}", @@ -978,6 +977,7 @@ "retry": "Retry", "cancel": "Cancel", "menu": "Menu", + "on": "on", "total.balance": "Total balance", "active": "Active", "staked": "Staked", diff --git a/src/redux/sagas/actions/payment.ts b/src/redux/sagas/actions/payment.ts index ddd6269bc74..7586c1156c4 100644 --- a/src/redux/sagas/actions/payment.ts +++ b/src/redux/sagas/actions/payment.ts @@ -1,24 +1,32 @@ import { ClientType, ColonyRole } from '@colony/colony-js'; -import { BigNumber } from 'ethers'; +import { type CustomContract } from '@colony/sdk'; +import { BigNumber, utils } from 'ethers'; import { call, fork, put, takeEvery } from 'redux-saga/effects'; -import { type ColonyManager } from '~context/index.ts'; +import { oneTxPaymentAbi } from '~constants/abis.ts'; +import { + ContextModule, + getContext, + type ColonyManager, +} from '~context/index.ts'; +import { + transactionHashReceived, + transactionReceiptReceived, + transactionSent, + transactionSucceeded, +} from '~redux/actionCreators/transactions.ts'; import { ActionTypes, type Action, type AllActions } from '~redux/index.ts'; import { type OneTxPaymentPayload } from '~redux/types/actions/colonyActions.ts'; -import { - transactionSetParams, - transactionSetPending, -} from '~state/transactionState.ts'; +import { addTransactionToDb } from '~state/transactionState.ts'; +import { TransactionStatus } from '~types/graphql.ts'; import { TRANSACTION_METHODS } from '~types/transactions.ts'; import { createTransaction, createTransactionChannels, getTxChannel, - waitForTxResult, } from '../transactions/index.ts'; import { - initiateTransaction, putError, takeFrom, uploadAnnotation, @@ -32,6 +40,7 @@ function* createPaymentAction({ payload: { colonyAddress, domainId, + chainId, payments, annotationMessage, customActionTitle, @@ -64,6 +73,23 @@ function* createPaymentAction({ } } + txChannel = yield call(getTxChannel, metaId); + + const oneTxPaymentClient = yield colonyManager.getClient( + ClientType.OneTxPaymentClient, + colonyAddress, + ); + + const oneTxPaymentContract: CustomContract = + colonyManager.getCustomContract( + oneTxPaymentClient.address, + oneTxPaymentAbi, + ); + + const { address } = getContext(ContextModule.Wallet); + + const walletAddress = utils.getAddress(address); + const payouts = yield adjustPayoutsAddresses(payments, network); const sortedCombinedPayments = sortAndCombinePayments(payouts); @@ -71,6 +97,9 @@ function* createPaymentAction({ ({ tokenAddress }) => tokenAddress, ); + // we don't use multiple payments, but let's add the chainId for each payment just in case + const chainIds = sortedCombinedPayments.map(() => chainId); + const amounts = sortedCombinedPayments.map(({ amount }) => amount); const recipientAddresses = sortedCombinedPayments.map( @@ -83,23 +112,53 @@ function* createPaymentAction({ */ const batchKey = TRANSACTION_METHODS.Payment; - const { paymentAction, annotatePaymentAction } = - yield createTransactionChannels(metaId, [ - 'paymentAction', - 'annotatePaymentAction', - ]); + const { annotatePaymentAction } = yield createTransactionChannels(metaId, [ + 'annotatePaymentAction', + ]); + + const [extensionPDID, extensionCSI] = yield getMultiPermissionProofs({ + colonyAddress, + domainId, + roles: [ColonyRole.Funding, ColonyRole.Administration], + customAddress: oneTxPaymentClient.address, + }); + const [userPDID, userCSI] = yield getMultiPermissionProofs({ + colonyAddress, + domainId, + roles: [ColonyRole.Funding, ColonyRole.Administration], + }); + + // @TODO type these + const params = [ + extensionPDID, + extensionCSI, + userPDID, + userCSI, + recipientAddresses, + chainIds, + tokenAddresses, + amounts, + domainId, + /* + * NOTE Always make the payment in the global skill 0 + * This will make it so that the user only receives reputation in the + * above domain, but none in the skill itself. + */ + 0, + ]; - yield fork(createTransaction, paymentAction.id, { - context: ClientType.OneTxPaymentClient, + yield addTransactionToDb(metaId, { + context: ClientType.ColonyClient, // @NOTE we want to add a new context type + createdAt: new Date(), methodName: 'makePaymentFundedFromDomain', - identifier: colonyAddress, - params: [], + from: walletAddress, + params, + status: TransactionStatus.Ready, group: { key: batchKey, id: metaId, index: 0, }, - ready: false, }); if (annotationMessage) { @@ -117,7 +176,37 @@ function* createPaymentAction({ }); } - yield takeFrom(paymentAction.channel, ActionTypes.TRANSACTION_CREATED); + const [transaction, waitForMined] = yield oneTxPaymentContract + .createTxCreator( + 'makePaymentFundedFromDomain(uint256,uint256,uint256,uint256,address[],uint256[],address[],uint256[],uint256,uint256)' as any, + // we ignore that because the params break due to the signature being untyped:waitForMined + // @ts-ignore + params, + ) + .tx() + .send({ + gasLimit: BigInt(10_000_000), + }); + + put(transactionSent(metaId)); + + if (!transaction || !transaction.blockHash || !transaction.blockNumber) { + throw new Error('Invalid transaction'); // @TODO add more info + } + + put( + transactionHashReceived(metaId, { + hash: transaction.hash, + blockNumber: transaction.blockNumber, + blockHash: transaction.blockHash, + params, + }), + ); + + const [eventData, receipt] = yield waitForMined(); + + put(transactionReceiptReceived(metaId, { params, receipt })); + put(transactionSucceeded(metaId, { eventData, receipt, params })); if (annotationMessage) { yield takeFrom( @@ -126,61 +215,19 @@ function* createPaymentAction({ ); } - yield transactionSetPending(paymentAction.id); - - const oneTxPaymentClient = yield colonyManager.getClient( - ClientType.OneTxPaymentClient, - colonyAddress, - ); - - const [extensionPDID, extensionCSI] = yield getMultiPermissionProofs({ - colonyAddress, - domainId, - roles: [ColonyRole.Funding, ColonyRole.Administration], - customAddress: oneTxPaymentClient.address, + yield createActionMetadataInDB(transaction.hash, { + customTitle: customActionTitle, }); - const [userPDID, userCSI] = yield getMultiPermissionProofs({ - colonyAddress, - domainId, - roles: [ColonyRole.Funding, ColonyRole.Administration], - }); - - yield transactionSetParams(paymentAction.id, [ - extensionPDID, - extensionCSI, - userPDID, - userCSI, - recipientAddresses, - tokenAddresses, - amounts, - domainId, - /* - * NOTE Always make the payment in the global skill 0 - * This will make it so that the user only receives reputation in the - * above domain, but none in the skill itself. - */ - 0, - ]); - - yield initiateTransaction(paymentAction.id); - - const { - payload: { - receipt: { transactionHash: txHash }, - }, - } = yield waitForTxResult(paymentAction.channel); - - yield createActionMetadataInDB(txHash, { customTitle: customActionTitle }); if (annotationMessage) { yield uploadAnnotation({ txChannel: annotatePaymentAction, message: annotationMessage, - txHash, + txHash: transaction.hash, }); } - setTxHash?.(txHash); + setTxHash?.(transaction.hash); yield put({ type: ActionTypes.ACTION_EXPENDITURE_PAYMENT_SUCCESS, diff --git a/src/redux/types/actions/colonyActions.ts b/src/redux/types/actions/colonyActions.ts index d041b8f7cbd..da7fb22f8b2 100644 --- a/src/redux/types/actions/colonyActions.ts +++ b/src/redux/types/actions/colonyActions.ts @@ -30,6 +30,7 @@ export type OneTxPaymentPayload = { colonyAddress: Address; domainId: number; customActionTitle: string; + chainId: string; payments: { recipientAddress: string; amount: string; diff --git a/src/utils/tokens.ts b/src/utils/tokens.ts index 93f68a76dc0..4414fe12696 100644 --- a/src/utils/tokens.ts +++ b/src/utils/tokens.ts @@ -120,6 +120,7 @@ export const calculateFee = ( }; }; +// @TODO filter by chainId too export const getSelectedToken = ( colony: Pick, tokenAddress: string, diff --git a/src/utils/validation/hasEnoughFundsValidation.ts b/src/utils/validation/hasEnoughFundsValidation.ts index eb1537faaa8..5886a214c80 100644 --- a/src/utils/validation/hasEnoughFundsValidation.ts +++ b/src/utils/validation/hasEnoughFundsValidation.ts @@ -3,6 +3,7 @@ import { BigNumber } from 'ethers'; import moveDecimal from 'move-decimal-point'; import { type TestContext } from 'yup'; +import { DEFAULT_NETWORK_INFO } from '~constants'; import { type Colony } from '~types/graphql.ts'; import { notNull } from '~utils/arrays/index.ts'; import { @@ -34,8 +35,12 @@ export const hasEnoughFundsValidation = ({ return false; } const { parent } = context; - const { tokenAddress: tokenAddressFieldValue } = parent || {}; + const { tokenAddress: tokenAddressFieldValue, chainId } = parent || {}; + // @TODO hook this up with actual balances + if (chainId !== DEFAULT_NETWORK_INFO.chainId) { + return true; + } const colonyTokens = colony.tokens?.items .filter(notNull) diff --git a/wagmi.config.ts b/wagmi.config.ts index 3ff760a3580..87d9f7de2f8 100644 --- a/wagmi.config.ts +++ b/wagmi.config.ts @@ -32,6 +32,11 @@ const contracts: Contract[] = [ address: '0x777760996135F0791E2e1a74aFAa060711197781', path: 'bridging/ProxyColony.sol/ProxyColony.json', }, + { + name: 'OneTxPayment', + address: '0x777760996135F0791E2e1a74aFAa060711197782', + path: 'extensions/OneTxPayment.sol/OneTxPayment.json', + }, ]; export default defineConfig({