Skip to content

feat(satp): add support for NFTs #3965

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(satp): add support for NFTs #3965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@
,"overriden"
,"Certificat"
,"adress"
,"NFToken"
,"NFT"
],
"dictionaries": [
"typescript,node,npm,go,rust"
Expand Down
2 changes: 1 addition & 1 deletion ...example-cbdc-bridging-backend/src/main/typescript/infrastructure/cbdc-besu-environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ export class BesuEnvironment {
id: BesuEnvironment.BESU_ASSET_ID,
referenceId: BesuEnvironment.BESU_ASSET_REFERENCE_ID,
amount,
tokenType: TokenType.NonstandardFungible,
tokenType: TokenType.Fungible,
networkId: {
id: BesuEnvironment.BESU_NETWORK_ID,
ledgerType: NetworkIdLedgerTypeEnum.Besu2X,
Expand Down
4 changes: 2 additions & 2 deletions ...ging-backend/src/main/typescript/infrastructure/cbdc-bridging-app-dummy-infrastructure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ export class CbdcBridgingAppDummyInfrastructure {
id: BesuEnvironment.BESU_NETWORK_ID,
ledgerType: LedgerType.Besu2X,
},
TokenType.NonstandardFungible,
TokenType.Fungible,
);

if (!reqApproveBesuAddress?.data.approveAddress) {
Expand All @@ -429,7 +429,7 @@ export class CbdcBridgingAppDummyInfrastructure {
id: FabricEnvironment.FABRIC_NETWORK_ID,
ledgerType: LedgerType.Fabric2,
},
TokenType.NonstandardFungible,
TokenType.Fungible,
);

if (!reqApproveFabricAddress?.data.approveAddress) {
Expand Down
2 changes: 1 addition & 1 deletion ...ample-cbdc-bridging-backend/src/main/typescript/infrastructure/cbdc-fabric-environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ export class FabricEnvironment {
id: FabricEnvironment.FABRIC_ASSET_ID,
referenceId: FabricEnvironment.FABRIC_ASSET_REFERENCE_ID,
amount,
tokenType: TokenType.NonstandardFungible,
tokenType: TokenType.Fungible,
networkId: {
id: FabricEnvironment.FABRIC_NETWORK_ID,
ledgerType: NetworkIdLedgerTypeEnum.Fabric2,
Expand Down
99 changes: 70 additions & 29 deletions packages/cactus-plugin-satp-hermes/src/main/json/openapi-blo-bundled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
"contractName",
"networkId",
"tokenType",
"referenceId"
"referenceId",
"ercTokenStandard"
],
"properties": {
"id": {
Expand Down Expand Up @@ -141,16 +142,23 @@
"tokenType": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
"description": "The type of token."
},
"referenceId": {
"type": "string"
},
"ercTokenStandard": {
"type": "string",
"enum": [
"UNSPECIFIED",
"ERC20",
"ERC721",
"ERC1155"
],
"description": "The ERC token standard."
}
}
},
Expand All @@ -163,7 +171,8 @@
"contractName",
"networkId",
"tokenType",
"referenceId"
"referenceId",
"ercTokenStandard"
],
"properties": {
"id": {
Expand Down Expand Up @@ -217,16 +226,23 @@
"tokenType": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
"description": "The type of token."
},
"referenceId": {
"type": "string"
},
"ercTokenStandard": {
"type": "string",
"enum": [
"UNSPECIFIED",
"ERC20",
"ERC721",
"ERC1155"
],
"description": "The ERC token standard."
}
}
}
Expand Down Expand Up @@ -2641,9 +2657,6 @@
"schema": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
Expand Down Expand Up @@ -4533,7 +4546,8 @@
"contractName",
"networkId",
"tokenType",
"referenceId"
"referenceId",
"ercTokenStandard"
],
"properties": {
"id": {
Expand Down Expand Up @@ -4587,16 +4601,23 @@
"tokenType": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
"description": "The type of token."
},
"referenceId": {
"type": "string"
},
"ercTokenStandard": {
"type": "string",
"enum": [
"UNSPECIFIED",
"ERC20",
"ERC721",
"ERC1155"
],
"description": "The ERC token standard."
}
}
},
Expand Down Expand Up @@ -4627,7 +4648,8 @@
"contractName",
"networkId",
"tokenType",
"referenceId"
"referenceId",
"ercTokenStandard"
],
"properties": {
"id": {
Expand Down Expand Up @@ -4681,16 +4703,23 @@
"tokenType": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
"description": "The type of token."
},
"referenceId": {
"type": "string"
},
"ercTokenStandard": {
"type": "string",
"enum": [
"UNSPECIFIED",
"ERC20",
"ERC721",
"ERC1155"
],
"description": "The ERC token standard."
}
}
},
Expand All @@ -4703,7 +4732,8 @@
"contractName",
"networkId",
"tokenType",
"referenceId"
"referenceId",
"ercTokenStandard"
],
"properties": {
"id": {
Expand Down Expand Up @@ -4757,16 +4787,23 @@
"tokenType": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
"description": "The type of token."
},
"referenceId": {
"type": "string"
},
"ercTokenStandard": {
"type": "string",
"enum": [
"UNSPECIFIED",
"ERC20",
"ERC721",
"ERC1155"
],
"description": "The ERC token standard."
}
}
}
Expand Down Expand Up @@ -8261,9 +8298,6 @@
"tokenType": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
Expand Down Expand Up @@ -10024,14 +10058,21 @@
"TokenType": {
"type": "string",
"enum": [
"ERC20",
"ERC721",
"ERC1155",
"NONSTANDARD_FUNGIBLE",
"NONSTANDARD_NONFUNGIBLE"
],
"description": "The type of token."
},
"ERCTokenStandard": {
"type": "string",
"enum": [
"UNSPECIFIED",
"ERC20",
"ERC721",
"ERC1155"
],
"description": "The ERC token standard."
},
"DraftVersions": {
"type": "object",
"description": "The draft versions supported by the gateway.",
Expand Down
15 changes: 10 additions & 5 deletions packages/cactus-plugin-satp-hermes/src/main/proto/cacti/satp/v02/common/message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,8 @@ message WrapAssertionClaim {

enum TokenType {
TOKEN_TYPE_UNSPECIFIED = 0;
TOKEN_TYPE_ERC20 = 1;
TOKEN_TYPE_ERC721 = 2;
TOKEN_TYPE_ERC1155 = 3;
TOKEN_TYPE_NONSTANDARD_FUNGIBLE = 4;
TOKEN_TYPE_NONSTANDARD_NONFUNGIBLE = 5;
TOKEN_TYPE_NONSTANDARD_FUNGIBLE = 1;
TOKEN_TYPE_NONSTANDARD_NONFUNGIBLE = 2;
}

message Asset {
Expand All @@ -297,10 +294,18 @@ message Asset {
string msp_id = 8;
string channel_name = 9;
NetworkId network_id = 10;
ERCTokenStandard erc_token_standard = 11;
}

message NetworkId {
string id = 1;
string type = 2;
}

enum ERCTokenStandard {
ERC_TOKEN_STANDARD_UNSPECIFIED = 0;
ERC_TOKEN_STANDARD_ERC20 = 1;
ERC_TOKEN_STANDARD_ERC721 = 2;
ERC_TOKEN_STANDARD_ERC1155 = 3;
}

Loading
Loading