Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@longbowlu
longbowlu committed Sep 9, 2022
1 parent d1fb2db commit 3e3f339
Show file tree
Hide file tree
Showing 10 changed files with 794 additions and 862 deletions.
4 changes: 2 additions & 2 deletions crates/sui-json-rpc-types/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ impl<T: SuiData> SuiPastObjectRead<T> {
}),
Self::ObjectNotExists(id) => Err(SuiError::ObjectNotFound { object_id: *id }),
Self::VersionFound(o) => Ok(o),
Self::VersionNotFound(id, seq_num) => Err(SuiError::PastObjectNotFound {
Self::VersionNotFound(id, seq_num) => Err(SuiError::ObjectVersionNotFound {
object_id: *id,
version: *seq_num,
}),
Expand All @@ -1050,7 +1050,7 @@ impl<T: SuiData> SuiPastObjectRead<T> {
Self::ObjectNotExists(id) => Err(SuiError::ObjectNotFound { object_id: id }),
Self::VersionFound(o) => Ok(o),
Self::VersionNotFound(object_id, version) => {
Err(SuiError::PastObjectNotFound { object_id, version })
Err(SuiError::ObjectVersionNotFound { object_id, version })
}
Self::VersionTooHigh {
object_id,
Expand Down
46 changes: 23 additions & 23 deletions crates/sui-open-rpc/samples/objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"fields": {
"description": "An NFT created by the Sui Command Line Tool",
"id": {
"id": "0x10279e7b0292d67a238aa2d38d4f485011d64131"
"id": "0xe55c184478d987f20d1f1d28dab88c1f915c3dcb"
},
"name": "Example NFT",
"url": "ipfs://bafkreibngqhl3gaa7daob4i2vccziay2jjlp435cf66vhono7nrvww53ty"
}
},
"owner": {
"AddressOwner": "0x60f522d76a62cd9d18161495ed772dde1d33b47b"
"AddressOwner": "0x5b134916a82cf98ee682d4bf0a9ec8fa30f25f4f"
},
"previousTransaction": "NGxBGAdabVR3DDQOUg+rgghtvS+3B2Hh0m/ycVIb22g=",
"previousTransaction": "9IlGkZ6HfvTvkdT78gZrjyuZEHOvj5dSxR/eiZz8hJQ=",
"storageRebate": 25,
"reference": {
"objectId": "0x10279e7b0292d67a238aa2d38d4f485011d64131",
"objectId": "0xe55c184478d987f20d1f1d28dab88c1f915c3dcb",
"version": 1,
"digest": "FnXZE/Q9kRFcpZF4ONVYrBGfeLdJ/WKVE8gEDMCarMA="
"digest": "OkEXoj0CvpnwaB+IuMQHa1qY8+y0EjMCtWhPDbTr2hM="
}
}
},
Expand All @@ -37,19 +37,19 @@
"fields": {
"balance": 100000000,
"id": {
"id": "0x1d8abfd088c0efcfd003eaec85d9f96ed74a123b"
"id": "0x011b1ef0df4c3e2c3d2f6710f9ae024d973e8d74"
}
}
},
"owner": {
"AddressOwner": "0x60f522d76a62cd9d18161495ed772dde1d33b47b"
"AddressOwner": "0x5b134916a82cf98ee682d4bf0a9ec8fa30f25f4f"
},
"previousTransaction": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
"storageRebate": 0,
"reference": {
"objectId": "0x1d8abfd088c0efcfd003eaec85d9f96ed74a123b",
"objectId": "0x011b1ef0df4c3e2c3d2f6710f9ae024d973e8d74",
"version": 0,
"digest": "Rd9dgZ/JlWwRU1iBf+93M4EK4keCKIvriFgw1w9weZ8="
"digest": "2j+uhveHx9zUP2LGn2p3L8AUodlKZcIiY4d7a4J0Uhc="
}
}
},
Expand All @@ -59,16 +59,16 @@
"data": {
"dataType": "package",
"disassembled": {
"m1": "// Move bytecode v5\nmodule 82a29af7ac2baed4ea598fde4aeffb14c6617021.m1 {\nstruct Forge has store, key {\n\tid: UID,\n\tswords_created: u64\n}\nstruct Sword has store, key {\n\tid: UID,\n\tmagic: u64,\n\tstrength: u64\n}\n\ninit(Arg0: &mut TxContext) {\nB0:\n\t0: CopyLoc[0](Arg0: &mut TxContext)\n\t1: Call[6](new(&mut TxContext): UID)\n\t2: LdU64(0)\n\t3: Pack[0](Forge)\n\t4: StLoc[1](loc0: Forge)\n\t5: MoveLoc[1](loc0: Forge)\n\t6: MoveLoc[0](Arg0: &mut TxContext)\n\t7: FreezeRef\n\t8: Call[7](sender(&TxContext): address)\n\t9: Call[0](transfer<Forge>(Forge, address))\n\t10: Ret\n}\npublic magic(Arg0: &Sword): u64 {\nB0:\n\t0: MoveLoc[0](Arg0: &Sword)\n\t1: ImmBorrowField[0](Sword.magic: u64)\n\t2: ReadRef\n\t3: Ret\n}\npublic strength(Arg0: &Sword): u64 {\nB0:\n\t0: MoveLoc[0](Arg0: &Sword)\n\t1: ImmBorrowField[1](Sword.strength: u64)\n\t2: ReadRef\n\t3: Ret\n}\nentry public sword_create(Arg0: &mut Forge, Arg1: u64, Arg2: u64, Arg3: address, Arg4: &mut TxContext) {\nB0:\n\t0: MoveLoc[4](Arg4: &mut TxContext)\n\t1: Call[6](new(&mut TxContext): UID)\n\t2: MoveLoc[1](Arg1: u64)\n\t3: MoveLoc[2](Arg2: u64)\n\t4: Pack[1](Sword)\n\t5: StLoc[5](loc0: Sword)\n\t6: MoveLoc[5](loc0: Sword)\n\t7: MoveLoc[3](Arg3: address)\n\t8: Call[1](transfer<Sword>(Sword, address))\n\t9: CopyLoc[0](Arg0: &mut Forge)\n\t10: ImmBorrowField[2](Forge.swords_created: u64)\n\t11: ReadRef\n\t12: LdU64(1)\n\t13: Add\n\t14: MoveLoc[0](Arg0: &mut Forge)\n\t15: MutBorrowField[2](Forge.swords_created: u64)\n\t16: WriteRef\n\t17: Ret\n}\nentry public sword_transfer(Arg0: Sword, Arg1: address) {\nB0:\n\t0: MoveLoc[0](Arg0: Sword)\n\t1: MoveLoc[1](Arg1: address)\n\t2: Call[1](transfer<Sword>(Sword, address))\n\t3: Ret\n}\npublic swords_created(Arg0: &Forge): u64 {\nB0:\n\t0: MoveLoc[0](Arg0: &Forge)\n\t1: ImmBorrowField[2](Forge.swords_created: u64)\n\t2: ReadRef\n\t3: Ret\n}\n}"
"m1": "// Move bytecode v5\nmodule 1d5a2d02d4640974c5c4fbcdb837efae87951ed3.m1 {\nstruct Forge has store, key {\n\tid: UID,\n\tswords_created: u64\n}\nstruct Sword has store, key {\n\tid: UID,\n\tmagic: u64,\n\tstrength: u64\n}\n\ninit(Arg0: &mut TxContext) {\nB0:\n\t0: CopyLoc[0](Arg0: &mut TxContext)\n\t1: Call[6](new(&mut TxContext): UID)\n\t2: LdU64(0)\n\t3: Pack[0](Forge)\n\t4: StLoc[1](loc0: Forge)\n\t5: MoveLoc[1](loc0: Forge)\n\t6: MoveLoc[0](Arg0: &mut TxContext)\n\t7: FreezeRef\n\t8: Call[7](sender(&TxContext): address)\n\t9: Call[0](transfer<Forge>(Forge, address))\n\t10: Ret\n}\npublic magic(Arg0: &Sword): u64 {\nB0:\n\t0: MoveLoc[0](Arg0: &Sword)\n\t1: ImmBorrowField[0](Sword.magic: u64)\n\t2: ReadRef\n\t3: Ret\n}\npublic strength(Arg0: &Sword): u64 {\nB0:\n\t0: MoveLoc[0](Arg0: &Sword)\n\t1: ImmBorrowField[1](Sword.strength: u64)\n\t2: ReadRef\n\t3: Ret\n}\nentry public sword_create(Arg0: &mut Forge, Arg1: u64, Arg2: u64, Arg3: address, Arg4: &mut TxContext) {\nB0:\n\t0: MoveLoc[4](Arg4: &mut TxContext)\n\t1: Call[6](new(&mut TxContext): UID)\n\t2: MoveLoc[1](Arg1: u64)\n\t3: MoveLoc[2](Arg2: u64)\n\t4: Pack[1](Sword)\n\t5: StLoc[5](loc0: Sword)\n\t6: MoveLoc[5](loc0: Sword)\n\t7: MoveLoc[3](Arg3: address)\n\t8: Call[1](transfer<Sword>(Sword, address))\n\t9: CopyLoc[0](Arg0: &mut Forge)\n\t10: ImmBorrowField[2](Forge.swords_created: u64)\n\t11: ReadRef\n\t12: LdU64(1)\n\t13: Add\n\t14: MoveLoc[0](Arg0: &mut Forge)\n\t15: MutBorrowField[2](Forge.swords_created: u64)\n\t16: WriteRef\n\t17: Ret\n}\nentry public sword_transfer(Arg0: Sword, Arg1: address) {\nB0:\n\t0: MoveLoc[0](Arg0: Sword)\n\t1: MoveLoc[1](Arg1: address)\n\t2: Call[1](transfer<Sword>(Sword, address))\n\t3: Ret\n}\npublic swords_created(Arg0: &Forge): u64 {\nB0:\n\t0: MoveLoc[0](Arg0: &Forge)\n\t1: ImmBorrowField[2](Forge.swords_created: u64)\n\t2: ReadRef\n\t3: Ret\n}\n}"
}
},
"owner": "Immutable",
"previousTransaction": "ljSKDIC8B/AjOXEGlRYZxUa9ZL/j9Z1r5v1CySol54k=",
"previousTransaction": "9AfwcAlpAjhj0UquPXb6VIC+GPObT+OWyiw4B2lVUIs=",
"storageRebate": 0,
"reference": {
"objectId": "0x82a29af7ac2baed4ea598fde4aeffb14c6617021",
"objectId": "0x1d5a2d02d4640974c5c4fbcdb837efae87951ed3",
"version": 1,
"digest": "CFeKfWuPo058pH2aCUqu1S0imUFfpueHYzMhKyujk0w="
"digest": "2XXcvzFPdnXVSst4kKUWFkLltvXxS3paG/jW0jZijcs="
}
}
},
Expand All @@ -77,21 +77,21 @@
"details": {
"data": {
"dataType": "moveObject",
"type": "0x58913af17699d5b9b97f828afd831d4cd409b0ae::hero::Hero",
"type": "0xaecb5cab6b9ecfadb7306f011820950e3abcec6a::hero::Hero",
"has_public_transfer": true,
"fields": {
"experience": 0,
"game_id": "0xe51a4152c79ae0456491c349ad6cd5023c8d94c0",
"game_id": "0xf15819e721de7916c4c6ce26452bec75e41b2c57",
"hp": 100,
"id": {
"id": "0x56d274cef468478c1b30cd8a053b0aaae1e8d571"
"id": "0xb70edef88ed2802e404ef9edba0f5d01731d589c"
},
"sword": {
"type": "0x58913af17699d5b9b97f828afd831d4cd409b0ae::hero::Sword",
"type": "0xaecb5cab6b9ecfadb7306f011820950e3abcec6a::hero::Sword",
"fields": {
"game_id": "0xe51a4152c79ae0456491c349ad6cd5023c8d94c0",
"game_id": "0xf15819e721de7916c4c6ce26452bec75e41b2c57",
"id": {
"id": "0xca7edcb03c27040ef97cd0c4005ecb4058a87247"
"id": "0x070930dd4d88992acea68bfc41c0ac8e4cffb93a"
},
"magic": 10,
"strength": 1
Expand All @@ -100,14 +100,14 @@
}
},
"owner": {
"AddressOwner": "0x60f522d76a62cd9d18161495ed772dde1d33b47b"
"AddressOwner": "0x5b134916a82cf98ee682d4bf0a9ec8fa30f25f4f"
},
"previousTransaction": "uvRR/ZVQ75HhewMQmp/G2kjb7ETmMCmYxdcVI6jVG+I=",
"previousTransaction": "go/9qf497GracECE+SzyVpzM+BxZGMWrZ0O75/yxt4k=",
"storageRebate": 21,
"reference": {
"objectId": "0x56d274cef468478c1b30cd8a053b0aaae1e8d571",
"objectId": "0xb70edef88ed2802e404ef9edba0f5d01731d589c",
"version": 1,
"digest": "AQ/zK6g681vs76niWR2728NKJzcEZIEivt+jqoKidm0="
"digest": "3tOglj1ubshz1Xf6ElWsDdCQ6dfcadKfSAbQ6is1lwA="
}
}
}
Expand Down
Loading

0 comments on commit 3e3f339

Please sign in to comment.