Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HIP-646/657/765: Implement token metadata acceptance tests #8166

Merged
merged 18 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8bedb8f
Clean manual merge with main of changes from old feature branch.
jascks Apr 23, 2024
d4a0e2e
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks Apr 24, 2024
7e5b63d
Improved state management for NFT serials. Full NFT flow passes on pr…
jascks Apr 25, 2024
416c8e3
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks Apr 25, 2024
8d000e1
Removed up specification of metadata bytes in steps. Cleaner overall …
jascks Apr 26, 2024
8dcd470
Added metadata and key steps to fungible token flow.
jascks Apr 26, 2024
df9322d
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks Apr 26, 2024
daffcc3
Verify token without metdata or key are valid. NPE fix.
jascks Apr 26, 2024
f4bf6a0
Minor cleanup.
jascks Apr 26, 2024
12d701d
Address PR comments.
jascks Apr 27, 2024
f83100d
Address PR comment.
jascks Apr 27, 2024
da2b42f
Update iInital token create with metadata key using ECDSA key, with l…
jascks Apr 27, 2024
d6248f5
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks May 6, 2024
6d32381
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks May 6, 2024
f9bc648
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks May 8, 2024
10b1a9e
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks May 16, 2024
4dc7757
Utilize Java SDK released 2.32.0.
jascks May 20, 2024
63f836d
Merge remote-tracking branch 'origin/main' into 7765-token-metadata-a…
jascks May 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: "Gradle"
on:
pull_request:
branches:
- 'main'
- 'release/**'
- "main"
jascks marked this conversation as resolved.
Show resolved Hide resolved
- "release/**"
push:
branches:
- 'main'
- 'release/**'
- "main"
- "release/**"
tags:
- 'v*'
- "v*"

defaults:
run:
Expand All @@ -25,7 +25,7 @@ env:
jobs:
build:
name: Build
runs-on: [ self-hosted, Linux, large, ephemeral ]
runs-on: [self-hosted, Linux, large, ephemeral]
strategy:
matrix:
project:
Expand All @@ -36,8 +36,8 @@ jobs:
- monitor
- rest
- rest-java
- 'rest:check-state-proof'
- 'rest:monitoring'
- "rest:check-state-proof"
- "rest:monitoring"
- rosetta
- test
- web3
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:

permissions:
contents: write


defaults:
run:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rosetta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
- cron: "0 1 * * *" # Daily at 1:00 AM
push:
branches:
- 'main'
- "main"
tags:
- 'v*'
- "v*"

defaults:
run:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: Security
on:
pull_request:
branches:
- 'main'
- 'release/**'
- "main"
- "release/**"
push:
branches:
- 'main'
- 'release/**'
- "main"
- "release/**"
tags:
- 'v*'
- "v*"

defaults:
run:
Expand Down Expand Up @@ -240,4 +240,4 @@ jobs:
snyk-to-html -i ${report}.json -o ${report}.html && \
html-to-markdown ${report}.html -o build/reports && \
cat ${report}.html.md >> $GITHUB_STEP_SUMMARY
fi
fi
6 changes: 3 additions & 3 deletions .github/workflows/snyk-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Snyk Monitor
on:
push:
branches:
- 'main'
- 'release/**'
- "main"
- "release/**"
tags:
- 'v*'
- "v*"

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ dependencies {
api("com.graphql-java:graphql-java-extended-validation:22.0")
api("com.hedera.evm:hedera-evm:0.48.0")
api("com.hedera.hashgraph:hedera-protobuf-java-api:0.49.0")
api("com.hedera.hashgraph:sdk:2.30.0")
api("com.hedera.hashgraph:sdk:2.32.0-beta.1")
api("com.ongres.scram:client:2.1")
api("com.playtika.testcontainers:embedded-google-pubsub:3.1.6")
api("com.redis.testcontainers:testcontainers-redis-junit-jupiter:1.4.6")
Expand Down
4 changes: 2 additions & 2 deletions docs/database/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ Following are the prerequisites and steps for migrating V1 data to V2.
[migration.config](/hedera-mirror-importer/src/main/resources/db/scripts/v2/migration.config).
4. Get the correct version of [flyway](https://flywaydb.org/documentation/usage/commandline/) based on your OS and
update it in the `FLYWAY_URL` field in the `migration.config` file. The default is set to the linux version.
5. Stop the [Importer](/docs/importer/README.md) process.
6. Run the [migration.sh](/hedera-mirror-importer/src/main/resources/db/scripts/v2/migration.sh) script. Due to the time it will take to complete the migration,
5. Stop the [Importer](/docs/importer/README.md) process.
jascks marked this conversation as resolved.
Show resolved Hide resolved
6. Run the [migration.sh](/hedera-mirror-importer/src/main/resources/db/scripts/v2/migration.sh) script. Due to the time it will take to complete the migration,
it is recommended to run the script in a way that doesn't require your terminal session to remain open (e.g. `./migration.sh > migration.log 2> migration-error.log & disown`)
7. Update the mirror node configuration to point to the new Citus DB and start it.

Expand Down