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.

Sign up for GitHub

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

Jump to bottom

Smart contract schema support #274

Merged
merged 60 commits into from
Dec 12, 2023
Merged

Smart contract schema support #274

merged 60 commits into from
Dec 12, 2023

Conversation

magnusbechwind
Copy link
Contributor

@magnusbechwind magnusbechwind commented Oct 11, 2023 •
edited
Loading

Purpose

Adds functionality for creating and serializing smart contract parameters as opposed to only allowing raw bytes as parameters.

Changes

Extended the FFI bindings to allow for passing parameters as json to the rust library and getting the serialized parameter back.

Added JNINError class allowing for error messages to be returned from the rust library.

Created a class, Schema, to represent smart contract schemas.

Created a class SchemaParameter to represent parameters serializable via a Schema.

Added from methods to InitContractPayload and UpdateContractPayload accepting the new SchemaParameter.

Implemented custom serialization of AbstractAddress and added ListParam, AccountAddressParam, AddressParam and ContractAddressParam for conveniently using lists of objects, AbstractAddress, ContractAddress and AccountAddress as smart contract parameters.

Extended the examples with Cis2Nft and Cis2WCCD demonstrating how to instantiate parameters for the different smart contract methods present in the cis2-nft and cis2-wCCD contracts.

Checklist

  • My code follows the style of this project.
  • The code compiles without warnings.
  • I have performed a self-review of the changes.
  • I have documented my code, in particular the intent of the
    hard-to-understand areas.
  • (If necessary) I have updated the CHANGELOG.

@magnusbechwind
Working (early) implementation of serializing receive parameters.
330112e 
Custom serialization of AbstractAddress.
Refactoring of Errors returned from JNI rust layer.
Refactoring of BakerKeys- ConfigureBakerKeys- TransferToPublicJni- Result to remove Optional fields.
@magnusbechwind
early implementation of instantiating UpdateContractPayload and Invok…
c308d20 
…eInstanceRequest with SchemaReceiveParameter
@magnusbechwind
Defined SchemaInitParameter class and function serializeInitParameter…
097fb72 
… in CryptoJniNative and lib.rs
@magnusbechwind
Implemented functionality for SchemaInitParameter in lib.rs.
5f6b0c7 
Added option to construct Schema from an InputStream
@magnusbechwind
Implemented functionality for SchemaInitParameter in lib.rs.
5cc9ff0 
Added option to construct Schema from an InputStream
@magnusbechwind
Refactoring SchemaInitParameter and SchemaReceiveParameter into one c…
a0c503f 
…lass (SchemaParameter). Comments.
@magnusbechwind
Remaining comments
1e25499
@magnusbechwind
Finalized serialization of AbstractAddress.
fc29d05
@magnusbechwind
Tests and start of examples
9b58d89
@magnusbechwind
Tests and start of examples
0f42189
@magnusbechwind
Fixed bug serializing ContractAddress and AccountAddress
3936bf4
@magnusbechwind
Added unit tests for serializaton of AbstractAddress, AccountAddress …
37db106 
…and ContractAddress
@magnusbechwind
UInt8 wrapper and tests.
4bf974d
@magnusbechwind
Added wrappers and unit tests for AbstractAddress, AccountAddress and…
44a42b9 
… ContractAddress for passing directly as parameters. Moved smart contract related stuff to transactions.smartcontracts. Moved test resources.
@magnusbechwind
Added tests for ListParam
7375a41
@magnusbechwind
renaming
3c7a8d3
@magnusbechwind
ListParam made abstract
7ae2329
@magnusbechwind
Skeleton for example. All parameters (except a few wrappers needed fo…
b20e271 
…r wrapCCD) implemented and initializes correctly
@magnusbechwind
ListParam is now abstract and needs wrapper
ce02cfc
@magnusbechwind
renaming
b81599f
@magnusbechwind
Updated concordium-base
7a41189
@magnusbechwind
Cis2Nft example
f8d5f4a
@magnusbechwind
Cis2WCCD example
220fe5e
@magnusbechwind
Comments
a06a461
@magnusbechwind magnusbechwind marked this pull request as draft October 11, 2023 14:16
@magnusbechwind
Final run-through of all edited files
be79f45
@magnusbechwind
Merge branch 'main' into smartContractSchema
d31c3fa 
# Conflicts:
#	concordium-sdk/src/main/java/com/concordium/sdk/crypto/bakertransactions/BakerKeysResult.java
#	concordium-sdk/src/main/java/com/concordium/sdk/transactions/UpdateContractPayload.java
#	concordium-sdk/src/main/java/com/concordium/sdk/types/AccountAddress.java
@magnusbechwind
Cleanup after merge with main
380ad5e
@magnusbechwind
Updated CHANGELOG.md
4a3f298
abizjak
abizjak reviewed Nov 17, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
...les/src/main/java/com/concordium/sdk/examples/contractexample/cis2nft/Cis2NftParameters.java Outdated Show resolved Hide resolved
...les/src/main/java/com/concordium/sdk/examples/contractexample/cis2nft/Cis2NftParameters.java Show resolved Hide resolved
...ain/java/com/concordium/sdk/examples/contractexample/parameters/NftBalanceOfQueryParams.java Show resolved Hide resolved
...java/com/concordium/sdk/examples/contractexample/parameters/NftTokenMetaDataQueryParams.java Show resolved Hide resolved
crypto-jni/src/lib.rs Outdated Show resolved Hide resolved
crypto-jni/src/lib.rs Outdated Show resolved Hide resolved
crypto-jni/src/lib.rs Show resolved Hide resolved
crypto-jni/src/lib.rs Show resolved Hide resolved
crypto-jni/src/lib.rs Outdated Show resolved Hide resolved
MilkywayPirate
MilkywayPirate reviewed Nov 27, 2023
View reviewed changes
Copy link
Contributor

@MilkywayPirate MilkywayPirate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few extra comments for now

...amples/src/main/java/com/concordium/sdk/examples/contractexample/parameters/TokenIdUnit.java Show resolved Hide resolved
...amples/src/main/java/com/concordium/sdk/examples/contractexample/parameters/TokenIdUnit.java Outdated Show resolved Hide resolved
concordium-sdk/src/main/java/com/concordium/sdk/ClientV2.java Outdated Show resolved Hide resolved
concordium-sdk/src/main/java/com/concordium/sdk/ClientV2.java Outdated Show resolved Hide resolved
concordium-sdk/src/main/java/com/concordium/sdk/ClientV2.java Outdated Show resolved Hide resolved
concordium-sdk/src/main/java/com/concordium/sdk/ClientV2.java Outdated Show resolved Hide resolved
concordium-sdk/src/main/java/com/concordium/sdk/ClientV2.java Outdated Show resolved Hide resolved
concordium-sdk/src/main/java/com/concordium/sdk/ClientV2.java Outdated Show resolved Hide resolved
MilkywayPirate
MilkywayPirate approved these changes Dec 7, 2023
View reviewed changes
Copy link
Contributor

@MilkywayPirate MilkywayPirate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. GJ.

abizjak
abizjak approved these changes Dec 11, 2023
View reviewed changes
Copy link
Contributor

@abizjak abizjak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's not there, as it appears not to be, please add clippy & formatting to the rust JNI bindings, using the standard rustfmt.toml config from concordium-base.

crypto-jni/src/lib.rs Outdated Show resolved Hide resolved
crypto-jni/src/lib.rs Outdated Show resolved Hide resolved
crypto-jni/src/lib.rs Outdated Show resolved Hide resolved
crypto-jni/src/lib.rs Outdated Show resolved Hide resolved
magnusbechwind and others added 6 commits December 12, 2023 10:57
@magnusbechwind @abizjak
Apply suggestions from code review
35ecdce 
Co-authored-by: Aleš Bizjak <abizjak@users.noreply.github.com>
@magnusbechwind
Refactored examples
f7c2cb2
@magnusbechwind
Merge remote-tracking branch 'origin/smartContractSchema' into smartC…
adf8ef8 
…ontractSchema
@magnusbechwind
Cleanup of rust bindings
0f7f6f5
@magnusbechwind
Merge branch 'main' into smartContractSchema
5a29547 
# Conflicts:
#	CHANGELOG.md
#	concordium-sdk/src/main/java/com/concordium/sdk/transactions/Hash.java
@magnusbechwind
Added rustfmt to crypto-native
c409ba0
@magnusbechwind magnusbechwind merged commit 102c806 into main Dec 12, 2023
1 check passed
@magnusbechwind magnusbechwind deleted the smartContractSchema branch December 12, 2023 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abizjak abizjak abizjak approved these changes

@MilkywayPirate MilkywayPirate MilkywayPirate approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Smart contract schema support
3 participants
@magnusbechwind @abizjak @MilkywayPirate