commit 6347b668a2a6890fff9d1444d44cc11b8f8094af
parent bb708756bd7251cd803c2853230f192cc2f644f5
Author: lash <dev@holbrook.no>
Date: Fri, 16 Dec 2022 21:13:09 +0000
Change arg order for minting
Diffstat:
5 files changed, 71 insertions(+), 27 deletions(-)
diff --git a/python/eth_craft_nft/data/CraftNFT.bin b/python/eth_craft_nft/data/CraftNFT.bin
@@ -1 +1 @@
-60806040523480156200001157600080fd5b506040516200280b3803806200280b833981810160405281019062000037919062000236565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555081600690816200008891906200050c565b5080600790816200009a91906200050c565b505050620005f3565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6200010c82620000c1565b810181811067ffffffffffffffff821117156200012e576200012d620000d2565b5b80604052505050565b600062000143620000a3565b905062000151828262000101565b919050565b600067ffffffffffffffff821115620001745762000173620000d2565b5b6200017f82620000c1565b9050602081019050919050565b60005b83811015620001ac5780820151818401526020810190506200018f565b60008484015250505050565b6000620001cf620001c98462000156565b62000137565b905082815260208101848484011115620001ee57620001ed620000bc565b5b620001fb8482856200018c565b509392505050565b600082601f8301126200021b576200021a620000b7565b5b81516200022d848260208601620001b8565b91505092915050565b6000806040838503121562000250576200024f620000ad565b5b600083015167ffffffffffffffff811115620002715762000270620000b2565b5b6200027f8582860162000203565b925050602083015167ffffffffffffffff811115620002a357620002a2620000b2565b5b620002b18582860162000203565b9150509250929050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200030e57607f821691505b602082108103620003245762000323620002c6565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620003917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826200034f565b6200039d86836200034f565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620003ea620003e4620003de84620003b5565b620003bf565b620003b5565b9050919050565b6000819050919050565b6200040683620003c9565b6200041e6200041582620003f1565b8484546200035f565b825550505050565b600090565b6200043562000426565b62000442818484620003fb565b505050565b5b818110156200046a576200045e6000826200042b565b60018101905062000448565b5050565b601f821115620004b95762000483816200032a565b6200048e846200033f565b810160208510156200049e578190505b620004b6620004ad856200033f565b83018262000447565b50505b505050565b60008160020a8304905092915050565b6000620004e160001984600802620004be565b1980831691505092915050565b6000620004fc8383620004ce565b9150826002028217905092915050565b6200051782620002bb565b67ffffffffffffffff811115620005335762000532620000d2565b5b6200053f8254620002f5565b6200054c8282856200046e565b600060209050601f8311600181146200058457600084156200056f578287015190505b6200057b8582620004ee565b865550620005eb565b601f19841662000594866200032a565b60005b82811015620005be5784890151825560018201915060208501945060208101905062000597565b86831015620005de5784890151620005da601f891682620004ce565b8355505b6001600288020188555050505b505050505050565b61220880620006036000396000f3fe608060405260043610610147576000357c0100000000000000000000000000000000000000000000000000000000900480636352211e116100c8578063a22cb4651161008c578063a22cb46514610469578063b88d4fde14610492578063b9adc41b146104ae578063bee2c0b5146104eb578063e985e9c514610528578063f9613ab21461056557610147565b80636352211e1461035c57806370a08231146103995780638da5cb5b146103d657806395d89b4114610401578063a06561aa1461042c57610147565b806342842e0e1161010f57806342842e0e1461024a5780634d03546a146102665780634f64b2be146102a3578063559f5dc9146102e057806357cbf6921461031f57610147565b806301ffc9a71461014c57806306fdde0314610189578063081812fc146101b457806323b872dd146101f157806324e0febc1461020d575b600080fd5b34801561015857600080fd5b50610173600480360381019061016e9190611863565b6105a2565b60405161018091906118ab565b60405180910390f35b34801561019557600080fd5b5061019e6106f6565b6040516101ab9190611956565b60405180910390f35b3480156101c057600080fd5b506101db60048036038101906101d691906119ae565b610784565b6040516101e89190611a1c565b60405180910390f35b61020b60048036038101906102069190611a63565b6107c1565b005b34801561021957600080fd5b50610234600480360381019061022f9190611aec565b610830565b6040516102419190611b28565b60405180910390f35b610264600480360381019061025f9190611a63565b610848565b005b34801561027257600080fd5b5061028d60048036038101906102889190611b81565b6108b7565b60405161029a91906118ab565b60405180910390f35b3480156102af57600080fd5b506102ca60048036038101906102c591906119ae565b610af5565b6040516102d79190611b28565b60405180910390f35b3480156102ec57600080fd5b5061030760048036038101906103029190611bc1565b610b19565b60405161031693929190611c10565b60405180910390f35b34801561032b57600080fd5b5061034660048036038101906103419190611c47565b610b92565b6040516103539190611b28565b60405180910390f35b34801561036857600080fd5b50610383600480360381019061037e91906119ae565b610c1b565b6040516103909190611a1c565b60405180910390f35b3480156103a557600080fd5b506103c060048036038101906103bb9190611c87565b610c57565b6040516103cd9190611cc3565b60405180910390f35b3480156103e257600080fd5b506103eb610c5e565b6040516103f89190611a1c565b60405180910390f35b34801561040d57600080fd5b50610416610c82565b6040516104239190611956565b60405180910390f35b34801561043857600080fd5b50610453600480360381019061044e9190611cde565b610d10565b6040516104609190611b28565b60405180910390f35b34801561047557600080fd5b50610490600480360381019061048b9190611d5d565b610f40565b005b6104ac60048036038101906104a79190611ed2565b6111e2565b005b3480156104ba57600080fd5b506104d560048036038101906104d09190611aec565b6112b9565b6040516104e291906118ab565b60405180910390f35b3480156104f757600080fd5b50610512600480360381019061050d9190611f55565b6112eb565b60405161051f9190611fc1565b60405180910390f35b34801561053457600080fd5b5061054f600480360381019061054a9190611fdc565b6113be565b60405161055c91906118ab565b60405180910390f35b34801561057157600080fd5b5061058c60048036038101906105879190611aec565b611456565b6040516105999190611b28565b60405180910390f35b60006380ac58cd7c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036105f657600190506106f1565b635b5e139f7c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361064857600190506106f1565b63780e9d637c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361069a57600190506106f1565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106ec57600190506106f1565b600090505b919050565b600680546107039061204b565b80601f016020809104026020016040519081016040528092919081815260200182805461072f9061204b565b801561077c5780601f106107515761010080835404028352916020019161077c565b820191906000526020600020905b81548152906001019060200180831161075f57829003601f168201915b505050505081565b60006004600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b60606107cf848484846114c3565b818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a450505050565b60036020528060005260406000206000915090505481565b6060610856848484846114c3565b818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a450505050565b60008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461091557600080fd5b61091d6117be565b6002600087815260200190815260200160002080549050925060008311156109ed576000600260008881526020019081526020016000206000815481106109675761096661207c565b5b9060005260206000200160000160009054906101000a900465ffffffffffff1665ffffffffffff161161099957600080fd5b600260008781526020019081526020016000206001846109b991906120da565b815481106109ca576109c961207c565b5b9060005260206000200160000160069054906101000a900465ffffffffffff1691505b84816000019065ffffffffffff16908165ffffffffffff16815250508482610a15919061210e565b816020019065ffffffffffff16908165ffffffffffff168152505060026000878152602001908152602001600020819080600181540180825580915050600190039060005260206000200160009091909190915060008201518160000160006101000a81548165ffffffffffff021916908365ffffffffffff16021790555060208201518160000160066101000a81548165ffffffffffff021916908365ffffffffffff160217905550604082015181600001600c6101000a81548165ffffffffffff021916908365ffffffffffff160217905550505050505092915050565b60018181548110610b0557600080fd5b906000526020600020016000915090505481565b60026020528160005260406000208181548110610b3557600080fd5b90600052602060002001600091509150508060000160009054906101000a900465ffffffffffff16908060000160069054906101000a900465ffffffffffff169080600001600c9054906101000a900465ffffffffffff16905083565b6000806000600102600360008681526020019081526020016000205414610bb857600080fd5b8273ffffffffffffffffffffffffffffffffffffffff1690507f8000000000000000000000000000000000000000000000000000000000000000811790508060010260036000868152602001908152602001600020819055508391505092915050565b600080600360008460010281526020019081526020016000205490506060819060020a026c010000000000000000000000009004915050919050565b6000919050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60078054610c8f9061204b565b80601f0160208091040260200160405190810160405280929190818152602001828054610cbb9061204b565b8015610d085780601f10610cdd57610100808354040283529160200191610d08565b820191906000526020600020905b815481529060010190602001808311610ceb57829003601f168201915b505050505081565b600080600080600260008881526020019081526020016000208681548110610d3b57610d3a61207c565b5b906000526020600020019050600086148015610d75575060008160000160009054906101000a900465ffffffffffff1665ffffffffffff16145b15610dd657600181600001600c8282829054906101000a900465ffffffffffff16610da0919061210e565b92506101000a81548165ffffffffffff021916908365ffffffffffff160217905550610dcc8786610b92565b9350505050610f39565b8060000160009054906101000a900465ffffffffffff1665ffffffffffff1681600001600c9054906101000a900465ffffffffffff1665ffffffffffff1610610e1e57600080fd5b65ffffffffffff876001900416915060c8829060020a0291507f8000000000000000000000000000000000000000000000000000000000000000821791508473ffffffffffffffffffffffffffffffffffffffff16821791507fffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000087600190041692506028869060020a028317925080600001600c9054906101000a900465ffffffffffff1665ffffffffffff1683179250600181600001600c8282829054906101000a900465ffffffffffff16610ef5919061210e565b92506101000a81548165ffffffffffff021916908365ffffffffffff1602179055508160010260036000856001028152602001908152602001600020819055505050505b9392505050565b801561106157600073ffffffffffffffffffffffffffffffffffffffff16600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614610fde57600080fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550611179565b600073ffffffffffffffffffffffffffffffffffffffff16600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16036110f957600080fd5b6000600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b8173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31836040516111d691906118ab565b60405180910390a35050565b6111ee848484846114c3565b818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167f75c9e114f073c346aac7d1d7e9a3c3c14edabcdd27de07d1d9e425f45d318c5e60006001026040516112ab9190611b28565b60405180910390a450505050565b6000807f8000000000000000000000000000000000000000000000000000000000000000836001900416119050919050565b6000808290505b600260008681526020019081526020016000208054905081101561139257836fffffffffffffffffffffffffffffffff166002600087815260200190815260200160002082815481106113485761134761207c565b5b9060005260206000200160000160069054906101000a900465ffffffffffff1665ffffffffffff16111561137f57809150506113b7565b808061138a90612148565b9150506112f2565b507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90505b9392505050565b60008173ffffffffffffffffffffffffffffffffffffffff16600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614905092915050565b60008060036000848152602001908152602001600020549050611478816112b9565b61148157600080fd5b60a081908060020a820491505090507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000060010283168117905080915050919050565b60003073ffffffffffffffffffffffffffffffffffffffff16636352211e846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040161151a9190611cc3565b602060405180830381865afa158015611537573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061155b91906121a5565b90508473ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161461159557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16146116c9573373ffffffffffffffffffffffffffffffffffffffff166004600085815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614806116bf57503373ffffffffffffffffffffffffffffffffffffffff16600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16145b6116c857600080fd5b5b60006004600085815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550611726838561172d565b5050505050565b60008083600102905060036000828152602001908152602001600020546001900491506000820361175d57600080fd5b7fffffffffffffffffffffffff0000000000000000000000000000000000000000821691508273ffffffffffffffffffffffffffffffffffffffff168217915081600102600360008381526020019081526020016000208190555050505050565b6040518060600160405280600065ffffffffffff168152602001600065ffffffffffff168152602001600065ffffffffffff1681525090565b6000604051905090565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6118408161180b565b811461184b57600080fd5b50565b60008135905061185d81611837565b92915050565b60006020828403121561187957611878611801565b5b60006118878482850161184e565b91505092915050565b60008115159050919050565b6118a581611890565b82525050565b60006020820190506118c0600083018461189c565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156119005780820151818401526020810190506118e5565b60008484015250505050565b6000601f19601f8301169050919050565b6000611928826118c6565b61193281856118d1565b93506119428185602086016118e2565b61194b8161190c565b840191505092915050565b60006020820190508181036000830152611970818461191d565b905092915050565b6000819050919050565b61198b81611978565b811461199657600080fd5b50565b6000813590506119a881611982565b92915050565b6000602082840312156119c4576119c3611801565b5b60006119d284828501611999565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611a06826119db565b9050919050565b611a16816119fb565b82525050565b6000602082019050611a316000830184611a0d565b92915050565b611a40816119fb565b8114611a4b57600080fd5b50565b600081359050611a5d81611a37565b92915050565b600080600060608486031215611a7c57611a7b611801565b5b6000611a8a86828701611a4e565b9350506020611a9b86828701611a4e565b9250506040611aac86828701611999565b9150509250925092565b6000819050919050565b611ac981611ab6565b8114611ad457600080fd5b50565b600081359050611ae681611ac0565b92915050565b600060208284031215611b0257611b01611801565b5b6000611b1084828501611ad7565b91505092915050565b611b2281611ab6565b82525050565b6000602082019050611b3d6000830184611b19565b92915050565b600065ffffffffffff82169050919050565b611b5e81611b43565b8114611b6957600080fd5b50565b600081359050611b7b81611b55565b92915050565b60008060408385031215611b9857611b97611801565b5b6000611ba685828601611ad7565b9250506020611bb785828601611b6c565b9150509250929050565b60008060408385031215611bd857611bd7611801565b5b6000611be685828601611ad7565b9250506020611bf785828601611999565b9150509250929050565b611c0a81611b43565b82525050565b6000606082019050611c256000830186611c01565b611c326020830185611c01565b611c3f6040830184611c01565b949350505050565b60008060408385031215611c5e57611c5d611801565b5b6000611c6c85828601611ad7565b9250506020611c7d85828601611a4e565b9150509250929050565b600060208284031215611c9d57611c9c611801565b5b6000611cab84828501611a4e565b91505092915050565b611cbd81611978565b82525050565b6000602082019050611cd86000830184611cb4565b92915050565b600080600060608486031215611cf757611cf6611801565b5b6000611d0586828701611ad7565b9350506020611d1686828701611999565b9250506040611d2786828701611a4e565b9150509250925092565b611d3a81611890565b8114611d4557600080fd5b50565b600081359050611d5781611d31565b92915050565b60008060408385031215611d7457611d73611801565b5b6000611d8285828601611a4e565b9250506020611d9385828601611d48565b9150509250929050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b611ddf8261190c565b810181811067ffffffffffffffff82111715611dfe57611dfd611da7565b5b80604052505050565b6000611e116117f7565b9050611e1d8282611dd6565b919050565b600067ffffffffffffffff821115611e3d57611e3c611da7565b5b611e468261190c565b9050602081019050919050565b82818337600083830152505050565b6000611e75611e7084611e22565b611e07565b905082815260208101848484011115611e9157611e90611da2565b5b611e9c848285611e53565b509392505050565b600082601f830112611eb957611eb8611d9d565b5b8135611ec9848260208601611e62565b91505092915050565b60008060008060808587031215611eec57611eeb611801565b5b6000611efa87828801611a4e565b9450506020611f0b87828801611a4e565b9350506040611f1c87828801611999565b925050606085013567ffffffffffffffff811115611f3d57611f3c611806565b5b611f4987828801611ea4565b91505092959194509250565b600080600060608486031215611f6e57611f6d611801565b5b6000611f7c86828701611ad7565b9350506020611f8d86828701611999565b9250506040611f9e86828701611999565b9150509250925092565b6000819050919050565b611fbb81611fa8565b82525050565b6000602082019050611fd66000830184611fb2565b92915050565b60008060408385031215611ff357611ff2611801565b5b600061200185828601611a4e565b925050602061201285828601611a4e565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061206357607f821691505b6020821081036120765761207561201c565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006120e582611978565b91506120f083611978565b9250828203905081811115612108576121076120ab565b5b92915050565b600061211982611b43565b915061212483611b43565b9250828201905065ffffffffffff811115612142576121416120ab565b5b92915050565b600061215382611978565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203612185576121846120ab565b5b600182019050919050565b60008151905061219f81611a37565b92915050565b6000602082840312156121bb576121ba611801565b5b60006121c984828501612190565b9150509291505056fea264697066735822122067f7eec6506b7094b7a03769dda68d351e19fb6492f2e414e3e39740a9a4c7db64736f6c63430008110033
-\ No newline at end of file
+60806040523480156200001157600080fd5b506040516200307038038062003070833981810160405281019062000037919062000236565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555081600690816200008891906200050c565b5080600790816200009a91906200050c565b505050620005f3565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6200010c82620000c1565b810181811067ffffffffffffffff821117156200012e576200012d620000d2565b5b80604052505050565b600062000143620000a3565b905062000151828262000101565b919050565b600067ffffffffffffffff821115620001745762000173620000d2565b5b6200017f82620000c1565b9050602081019050919050565b60005b83811015620001ac5780820151818401526020810190506200018f565b60008484015250505050565b6000620001cf620001c98462000156565b62000137565b905082815260208101848484011115620001ee57620001ed620000bc565b5b620001fb8482856200018c565b509392505050565b600082601f8301126200021b576200021a620000b7565b5b81516200022d848260208601620001b8565b91505092915050565b6000806040838503121562000250576200024f620000ad565b5b600083015167ffffffffffffffff811115620002715762000270620000b2565b5b6200027f8582860162000203565b925050602083015167ffffffffffffffff811115620002a357620002a2620000b2565b5b620002b18582860162000203565b9150509250929050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200030e57607f821691505b602082108103620003245762000323620002c6565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620003917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826200034f565b6200039d86836200034f565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620003ea620003e4620003de84620003b5565b620003bf565b620003b5565b9050919050565b6000819050919050565b6200040683620003c9565b6200041e6200041582620003f1565b8484546200035f565b825550505050565b600090565b6200043562000426565b62000442818484620003fb565b505050565b5b818110156200046a576200045e6000826200042b565b60018101905062000448565b5050565b601f821115620004b95762000483816200032a565b6200048e846200033f565b810160208510156200049e578190505b620004b6620004ad856200033f565b83018262000447565b50505b505050565b60008160020a8304905092915050565b6000620004e160001984600802620004be565b1980831691505092915050565b6000620004fc8383620004ce565b9150826002028217905092915050565b6200051782620002bb565b67ffffffffffffffff811115620005335762000532620000d2565b5b6200053f8254620002f5565b6200054c8282856200046e565b600060209050601f8311600181146200058457600084156200056f578287015190505b6200057b8582620004ee565b865550620005eb565b601f19841662000594866200032a565b60005b82811015620005be5784890151825560018201915060208501945060208101905062000597565b86831015620005de5784890151620005da601f891682620004ce565b8355505b6001600288020188555050505b505050505050565b612a6d80620006036000396000f3fe60806040526004361061015d576000357c01000000000000000000000000000000000000000000000000000000009004806370a08231116100d3578063b9adc41b1161008c578063b9adc41b146104c4578063bee2c0b514610501578063c87b56dd1461053e578063c9796c391461057b578063e985e9c5146105b8578063f9613ab2146105f55761015d565b806370a08231146103af5780638da5cb5b146103ec57806395d89b4114610417578063a22cb46514610442578063adf288df1461046b578063b88d4fde146104a85761015d565b806325cbaa181161012557806325cbaa181461026057806342842e0e1461029d5780634d03546a146102b95780634f64b2be146102f6578063559f5dc9146103335780636352211e146103725761015d565b806301ffc9a71461016257806306fdde031461019f578063081812fc146101ca57806323b872dd1461020757806324e0febc14610223575b600080fd5b34801561016e57600080fd5b5061018960048036038101906101849190612010565b610632565b6040516101969190612058565b60405180910390f35b3480156101ab57600080fd5b506101b46107d8565b6040516101c19190612103565b60405180910390f35b3480156101d657600080fd5b506101f160048036038101906101ec919061215b565b610866565b6040516101fe91906121c9565b60405180910390f35b610221600480360381019061021c9190612210565b6108a3565b005b34801561022f57600080fd5b5061024a60048036038101906102459190612299565b610912565b60405161025791906122d5565b60405180910390f35b34801561026c57600080fd5b50610287600480360381019061028291906122f0565b61092a565b60405161029491906122d5565b60405180910390f35b6102b760048036038101906102b29190612210565b610b5a565b005b3480156102c557600080fd5b506102e060048036038101906102db9190612381565b610bc9565b6040516102ed9190612058565b60405180910390f35b34801561030257600080fd5b5061031d6004803603810190610318919061215b565b610e07565b60405161032a91906122d5565b60405180910390f35b34801561033f57600080fd5b5061035a600480360381019061035591906123c1565b610e2b565b60405161036993929190612410565b60405180910390f35b34801561037e57600080fd5b506103996004803603810190610394919061215b565b610ea4565b6040516103a691906121c9565b60405180910390f35b3480156103bb57600080fd5b506103d660048036038101906103d19190612447565b610ee0565b6040516103e39190612483565b60405180910390f35b3480156103f857600080fd5b50610401610ee7565b60405161040e91906121c9565b60405180910390f35b34801561042357600080fd5b5061042c610f0b565b6040516104399190612103565b60405180910390f35b34801561044e57600080fd5b50610469600480360381019061046491906124ca565b610f99565b005b34801561047757600080fd5b50610492600480360381019061048d919061250a565b61123b565b60405161049f91906122d5565b60405180910390f35b6104c260048036038101906104bd919061267f565b6112c4565b005b3480156104d057600080fd5b506104eb60048036038101906104e69190612299565b61139b565b6040516104f89190612058565b60405180910390f35b34801561050d57600080fd5b5061052860048036038101906105239190612702565b6113cd565b604051610535919061276e565b60405180910390f35b34801561054a57600080fd5b506105656004803603810190610560919061215b565b6114a0565b6040516105729190612103565b60405180910390f35b34801561058757600080fd5b506105a2600480360381019061059d9190612299565b611550565b6040516105af9190612103565b60405180910390f35b3480156105c457600080fd5b506105df60048036038101906105da9190612789565b611b6b565b6040516105ec9190612058565b60405180910390f35b34801561060157600080fd5b5061061c60048036038101906106179190612299565b611c03565b60405161062991906122d5565b60405180910390f35b60006380ac58cd7c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361068657600190506107d3565b635b5e139f7c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106d857600190506107d3565b63780e9d637c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361072a57600190506107d3565b63449a52f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361077c57600190506107d3565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036107ce57600190506107d3565b600090505b919050565b600680546107e5906127f8565b80601f0160208091040260200160405190810160405280929190818152602001828054610811906127f8565b801561085e5780601f106108335761010080835404028352916020019161085e565b820191906000526020600020905b81548152906001019060200180831161084157829003601f168201915b505050505081565b60006004600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b60606108b184848484611c70565b818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a450505050565b60036020528060005260406000206000915090505481565b60008060008060026000878152602001908152602001600020858154811061095557610954612829565b5b90600052602060002001905060008514801561098f575060008160000160009054906101000a900465ffffffffffff1665ffffffffffff16145b156109f057600181600001600c8282829054906101000a900465ffffffffffff166109ba9190612887565b92506101000a81548165ffffffffffff021916908365ffffffffffff1602179055506109e6878761123b565b9350505050610b53565b8060000160009054906101000a900465ffffffffffff1665ffffffffffff1681600001600c9054906101000a900465ffffffffffff1665ffffffffffff1610610a3857600080fd5b65ffffffffffff866001900416915060c8829060020a0291507f8000000000000000000000000000000000000000000000000000000000000000821791508673ffffffffffffffffffffffffffffffffffffffff16821791507fffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000086600190041692506028859060020a028317925080600001600c9054906101000a900465ffffffffffff1665ffffffffffff1683179250600181600001600c8282829054906101000a900465ffffffffffff16610b0f9190612887565b92506101000a81548165ffffffffffff021916908365ffffffffffff1602179055508160010260036000856001028152602001908152602001600020819055505050505b9392505050565b6060610b6884848484611c70565b818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a450505050565b60008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610c2757600080fd5b610c2f611f6b565b600260008781526020019081526020016000208054905092506000831115610cff57600060026000888152602001908152602001600020600081548110610c7957610c78612829565b5b9060005260206000200160000160009054906101000a900465ffffffffffff1665ffffffffffff1611610cab57600080fd5b60026000878152602001908152602001600020600184610ccb91906128c1565b81548110610cdc57610cdb612829565b5b9060005260206000200160000160069054906101000a900465ffffffffffff1691505b84816000019065ffffffffffff16908165ffffffffffff16815250508482610d279190612887565b816020019065ffffffffffff16908165ffffffffffff168152505060026000878152602001908152602001600020819080600181540180825580915050600190039060005260206000200160009091909190915060008201518160000160006101000a81548165ffffffffffff021916908365ffffffffffff16021790555060208201518160000160066101000a81548165ffffffffffff021916908365ffffffffffff160217905550604082015181600001600c6101000a81548165ffffffffffff021916908365ffffffffffff160217905550505050505092915050565b60018181548110610e1757600080fd5b906000526020600020016000915090505481565b60026020528160005260406000208181548110610e4757600080fd5b90600052602060002001600091509150508060000160009054906101000a900465ffffffffffff16908060000160069054906101000a900465ffffffffffff169080600001600c9054906101000a900465ffffffffffff16905083565b600080600360008460010281526020019081526020016000205490506060819060020a026c010000000000000000000000009004915050919050565b6000919050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60078054610f18906127f8565b80601f0160208091040260200160405190810160405280929190818152602001828054610f44906127f8565b8015610f915780601f10610f6657610100808354040283529160200191610f91565b820191906000526020600020905b815481529060010190602001808311610f7457829003601f168201915b505050505081565b80156110ba57600073ffffffffffffffffffffffffffffffffffffffff16600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161461103757600080fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506111d2565b600073ffffffffffffffffffffffffffffffffffffffff16600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361115257600080fd5b6000600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b8173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c318360405161122f9190612058565b60405180910390a35050565b600080600060010260036000858152602001908152602001600020541461126157600080fd5b8373ffffffffffffffffffffffffffffffffffffffff1690507f8000000000000000000000000000000000000000000000000000000000000000811790508060010260036000858152602001908152602001600020819055508291505092915050565b6112d084848484611c70565b818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4818373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167f75c9e114f073c346aac7d1d7e9a3c3c14edabcdd27de07d1d9e425f45d318c5e600060010260405161138d91906122d5565b60405180910390a450505050565b6000807f8000000000000000000000000000000000000000000000000000000000000000836001900416119050919050565b6000808290505b600260008681526020019081526020016000208054905081101561147457836fffffffffffffffffffffffffffffffff1660026000878152602001908152602001600020828154811061142a57611429612829565b5b9060005260206000200160000160069054906101000a900465ffffffffffff1665ffffffffffff1611156114615780915050611499565b808061146c906128f5565b9150506113d4565b507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90505b9392505050565b606060003073ffffffffffffffffffffffffffffffffffffffff1663f9613ab2846001026040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004016114fc91906122d5565b602060405180830381865afa158015611519573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061153d9190612952565b905061154881611550565b915050919050565b606080600080604767ffffffffffffffff81111561157157611570612554565b5b6040519080825280601f01601f1916602001820160405280156115a35781602001600182028036833780820191505090505b5092507f7300000000000000000000000000000000000000000000000000000000000000836000815181106115db576115da612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053507f68000000000000000000000000000000000000000000000000000000000000008360018151811061163f5761163e612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053507f6100000000000000000000000000000000000000000000000000000000000000836002815181106116a3576116a2612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053507f32000000000000000000000000000000000000000000000000000000000000008360038151811061170757611706612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053507f35000000000000000000000000000000000000000000000000000000000000008360048151811061176b5761176a612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053507f3600000000000000000000000000000000000000000000000000000000000000836005815181106117cf576117ce612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053507f3a000000000000000000000000000000000000000000000000000000000000008360068151811061183357611832612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053506007905060005b6020811015611b5f57600460f087836020811061188957611888612829565b5b1a7f0100000000000000000000000000000000000000000000000000000000000000027f010000000000000000000000000000000000000000000000000000000000000090041660ff16908060020a82049150509250600a8360ff161015611961576030836118f8919061298c565b7f01000000000000000000000000000000000000000000000000000000000000000284838151811061192d5761192c612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053506119d3565b60578361196e919061298c565b7f0100000000000000000000000000000000000000000000000000000000000000028483815181106119a3576119a2612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053505b600f8682602081106119e8576119e7612829565b5b1a7f0100000000000000000000000000000000000000000000000000000000000000027f01000000000000000000000000000000000000000000000000000000000000009004169250600a8360ff161015611abf57603083611a4a919061298c565b7f01000000000000000000000000000000000000000000000000000000000000000284600184611a7a91906129c1565b81518110611a8b57611a8a612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350611b3d565b605783611acc919061298c565b7f01000000000000000000000000000000000000000000000000000000000000000284600184611afc91906129c1565b81518110611b0d57611b0c612829565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053505b600282611b4a91906129c1565b91508080611b57906128f5565b915050611869565b50829350505050919050565b60008173ffffffffffffffffffffffffffffffffffffffff16600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614905092915050565b60008060036000848152602001908152602001600020549050611c258161139b565b611c2e57600080fd5b60a081908060020a820491505090507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000060010283168117905080915050919050565b60003073ffffffffffffffffffffffffffffffffffffffff16636352211e846040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401611cc79190612483565b602060405180830381865afa158015611ce4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d089190612a0a565b90508473ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614611d4257600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff1614611e76573373ffffffffffffffffffffffffffffffffffffffff166004600085815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161480611e6c57503373ffffffffffffffffffffffffffffffffffffffff16600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16145b611e7557600080fd5b5b60006004600085815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550611ed38385611eda565b5050505050565b600080836001029050600360008281526020019081526020016000205460019004915060008203611f0a57600080fd5b7fffffffffffffffffffffffff0000000000000000000000000000000000000000821691508273ffffffffffffffffffffffffffffffffffffffff168217915081600102600360008381526020019081526020016000208190555050505050565b6040518060600160405280600065ffffffffffff168152602001600065ffffffffffff168152602001600065ffffffffffff1681525090565b6000604051905090565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611fed81611fb8565b8114611ff857600080fd5b50565b60008135905061200a81611fe4565b92915050565b60006020828403121561202657612025611fae565b5b600061203484828501611ffb565b91505092915050565b60008115159050919050565b6120528161203d565b82525050565b600060208201905061206d6000830184612049565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156120ad578082015181840152602081019050612092565b60008484015250505050565b6000601f19601f8301169050919050565b60006120d582612073565b6120df818561207e565b93506120ef81856020860161208f565b6120f8816120b9565b840191505092915050565b6000602082019050818103600083015261211d81846120ca565b905092915050565b6000819050919050565b61213881612125565b811461214357600080fd5b50565b6000813590506121558161212f565b92915050565b60006020828403121561217157612170611fae565b5b600061217f84828501612146565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006121b382612188565b9050919050565b6121c3816121a8565b82525050565b60006020820190506121de60008301846121ba565b92915050565b6121ed816121a8565b81146121f857600080fd5b50565b60008135905061220a816121e4565b92915050565b60008060006060848603121561222957612228611fae565b5b6000612237868287016121fb565b9350506020612248868287016121fb565b925050604061225986828701612146565b9150509250925092565b6000819050919050565b61227681612263565b811461228157600080fd5b50565b6000813590506122938161226d565b92915050565b6000602082840312156122af576122ae611fae565b5b60006122bd84828501612284565b91505092915050565b6122cf81612263565b82525050565b60006020820190506122ea60008301846122c6565b92915050565b60008060006060848603121561230957612308611fae565b5b6000612317868287016121fb565b935050602061232886828701612284565b925050604061233986828701612146565b9150509250925092565b600065ffffffffffff82169050919050565b61235e81612343565b811461236957600080fd5b50565b60008135905061237b81612355565b92915050565b6000806040838503121561239857612397611fae565b5b60006123a685828601612284565b92505060206123b78582860161236c565b9150509250929050565b600080604083850312156123d8576123d7611fae565b5b60006123e685828601612284565b92505060206123f785828601612146565b9150509250929050565b61240a81612343565b82525050565b60006060820190506124256000830186612401565b6124326020830185612401565b61243f6040830184612401565b949350505050565b60006020828403121561245d5761245c611fae565b5b600061246b848285016121fb565b91505092915050565b61247d81612125565b82525050565b60006020820190506124986000830184612474565b92915050565b6124a78161203d565b81146124b257600080fd5b50565b6000813590506124c48161249e565b92915050565b600080604083850312156124e1576124e0611fae565b5b60006124ef858286016121fb565b9250506020612500858286016124b5565b9150509250929050565b6000806040838503121561252157612520611fae565b5b600061252f858286016121fb565b925050602061254085828601612284565b9150509250929050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61258c826120b9565b810181811067ffffffffffffffff821117156125ab576125aa612554565b5b80604052505050565b60006125be611fa4565b90506125ca8282612583565b919050565b600067ffffffffffffffff8211156125ea576125e9612554565b5b6125f3826120b9565b9050602081019050919050565b82818337600083830152505050565b600061262261261d846125cf565b6125b4565b90508281526020810184848401111561263e5761263d61254f565b5b612649848285612600565b509392505050565b600082601f8301126126665761266561254a565b5b813561267684826020860161260f565b91505092915050565b6000806000806080858703121561269957612698611fae565b5b60006126a7878288016121fb565b94505060206126b8878288016121fb565b93505060406126c987828801612146565b925050606085013567ffffffffffffffff8111156126ea576126e9611fb3565b5b6126f687828801612651565b91505092959194509250565b60008060006060848603121561271b5761271a611fae565b5b600061272986828701612284565b935050602061273a86828701612146565b925050604061274b86828701612146565b9150509250925092565b6000819050919050565b61276881612755565b82525050565b6000602082019050612783600083018461275f565b92915050565b600080604083850312156127a05761279f611fae565b5b60006127ae858286016121fb565b92505060206127bf858286016121fb565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061281057607f821691505b602082108103612823576128226127c9565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061289282612343565b915061289d83612343565b9250828201905065ffffffffffff8111156128bb576128ba612858565b5b92915050565b60006128cc82612125565b91506128d783612125565b92508282039050818111156128ef576128ee612858565b5b92915050565b600061290082612125565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361293257612931612858565b5b600182019050919050565b60008151905061294c8161226d565b92915050565b60006020828403121561296857612967611fae565b5b60006129768482850161293d565b91505092915050565b600060ff82169050919050565b60006129978261297f565b91506129a28361297f565b9250828201905060ff8111156129bb576129ba612858565b5b92915050565b60006129cc82612125565b91506129d783612125565b92508282019050808211156129ef576129ee612858565b5b92915050565b600081519050612a04816121e4565b92915050565b600060208284031215612a2057612a1f611fae565b5b6000612a2e848285016129f5565b9150509291505056fea2646970667358221220d1f144a35f3a21cac18c88d05e3e6a80b152eaf539c1b14862eebc5ffc16256964736f6c63430008110033
+\ No newline at end of file
diff --git a/python/eth_craft_nft/data/CraftNFT.json b/python/eth_craft_nft/data/CraftNFT.json
@@ -1 +1 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_operator","type":"address"},{"indexed":false,"internalType":"bool","name":"_approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"uint256","name":"_tokenId","type":"uint256"},{"indexed":false,"internalType":"bytes32","name":"_data","type":"bytes32"}],"name":"TransferWithData","type":"event"},{"inputs":[{"internalType":"bytes32","name":"content","type":"bytes32"},{"internalType":"uint48","name":"count","type":"uint48"}],"name":"allocate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_content","type":"bytes32"},{"internalType":"uint256","name":"_superIndex","type":"uint256"},{"internalType":"uint256","name":"_startAt","type":"uint256"}],"name":"batchOf","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_truncatedId","type":"bytes32"}],"name":"getDigest","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_tokenContent","type":"bytes32"}],"name":"isActiveContent","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_owner","type":"address"},{"internalType":"address","name":"_operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_content","type":"bytes32"},{"internalType":"uint256","name":"_batch","type":"uint256"},{"internalType":"address","name":"_recipient","type":"address"}],"name":"mintFromBatchTo","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_content","type":"bytes32"},{"internalType":"address","name":"_recipient","type":"address"}],"name":"mintTo","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"mintedToken","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_tokenId","type":"uint256"},{"internalType":"bytes","name":"_data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"_operator","type":"address"},{"internalType":"bool","name":"_approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceID","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"token","outputs":[{"internalType":"uint48","name":"count","type":"uint48"},{"internalType":"uint48","name":"cumulativeCount","type":"uint48"},{"internalType":"uint48","name":"cursor","type":"uint48"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"tokens","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"payable","type":"function"}]
+[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_operator","type":"address"},{"indexed":false,"internalType":"bool","name":"_approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"uint256","name":"_tokenId","type":"uint256"},{"indexed":false,"internalType":"bytes32","name":"_data","type":"bytes32"}],"name":"TransferWithData","type":"event"},{"inputs":[{"internalType":"bytes32","name":"content","type":"bytes32"},{"internalType":"uint48","name":"count","type":"uint48"}],"name":"allocate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_content","type":"bytes32"},{"internalType":"uint256","name":"_superIndex","type":"uint256"},{"internalType":"uint256","name":"_startAt","type":"uint256"}],"name":"batchOf","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_truncatedId","type":"bytes32"}],"name":"getDigest","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_tokenContent","type":"bytes32"}],"name":"isActiveContent","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_owner","type":"address"},{"internalType":"address","name":"_operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"},{"internalType":"bytes32","name":"_content","type":"bytes32"},{"internalType":"uint256","name":"_batch","type":"uint256"}],"name":"mintFromBatchTo","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"},{"internalType":"bytes32","name":"_content","type":"bytes32"}],"name":"mintTo","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"mintedToken","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_tokenId","type":"uint256"},{"internalType":"bytes","name":"_data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"_operator","type":"address"},{"internalType":"bool","name":"_approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceID","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_data","type":"bytes32"}],"name":"toURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"token","outputs":[{"internalType":"uint48","name":"count","type":"uint48"},{"internalType":"uint48","name":"cumulativeCount","type":"uint48"},{"internalType":"uint48","name":"cursor","type":"uint48"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"tokenURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"tokens","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"payable","type":"function"}]
diff --git a/python/eth_craft_nft/nft.py b/python/eth_craft_nft/nft.py
@@ -131,15 +131,15 @@ class CraftNFT(ERC721):
return o
- def mint_to(self, contract_address, sender_address, token_id, batch, recipient, tx_format=TxFormat.JSONRPC):
+ def mint_to(self, contract_address, sender_address, recipient, token_id, batch, tx_format=TxFormat.JSONRPC):
enc = ABIContractEncoder()
enc.method('mintFromBatchTo')
+ enc.typ(ABIContractType.ADDRESS)
enc.typ(ABIContractType.BYTES32)
enc.typ(ABIContractType.UINT256)
- enc.typ(ABIContractType.ADDRESS)
+ enc.address(recipient)
enc.bytes32(token_id)
enc.uint256(batch)
- enc.address(recipient)
data = enc.get()
tx = self.template(sender_address, contract_address, use_nonce=True)
tx = self.set_code(tx, data)
diff --git a/python/tests/test_basic.py b/python/tests/test_basic.py
@@ -110,7 +110,7 @@ class Test(EthTesterCase):
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
c = CraftNFT(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
@@ -122,7 +122,7 @@ class Test(EthTesterCase):
r = self.conn.do(o)
self.assertEqual(r['status'], 1)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
@@ -139,17 +139,14 @@ class Test(EthTesterCase):
self.assertEqual(r['status'], 1)
for i in range(10):
- o = c.get_token_spec_raw(self.address, hash_of_foo, 0, sender_address=self.accounts[0])
- r = self.rpc.do(o)
-
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[(i%8)+i])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[(i%8)+i], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
self.assertEqual(r['status'], 1)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[9])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[9], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
@@ -161,7 +158,7 @@ class Test(EthTesterCase):
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
c = CraftNFT(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
@@ -173,31 +170,31 @@ class Test(EthTesterCase):
r = self.conn.do(o)
self.assertEqual(r['status'], 1)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 1, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 1)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
self.assertEqual(r['status'], 0)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
self.assertEqual(r['status'], 1)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
self.assertEqual(r['status'], 0)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 1, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 1)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
self.assertEqual(r['status'], 0)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[2])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[2], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
@@ -217,7 +214,7 @@ class Test(EthTesterCase):
(tx_hash_hex, o) = c.allocate(self.address, self.accounts[0], hash_of_foo, amount=10)
self.rpc.do(o)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
@@ -232,7 +229,7 @@ class Test(EthTesterCase):
owner = strip_0x(r)
self.assertTrue(is_same_address(owner[24:], self.accounts[1]))
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[2])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[2], hash_of_foo, 0)
self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
@@ -255,7 +252,7 @@ class Test(EthTesterCase):
(tx_hash_hex, o) = c.allocate(self.address, self.accounts[0], hash_of_foo, amount=0)
self.rpc.do(o)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 0, self.accounts[1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], hash_of_foo, 0)
self.rpc.do(o)
int_of_foo = int(hash_of_foo, 16)
@@ -291,13 +288,13 @@ class Test(EthTesterCase):
r = self.rpc.do(o)
batch = c.parse_batch_of(r)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, batch, self.accounts[(i%7)+1])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[(i%7)+1], hash_of_foo, batch)
r = self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
self.assertEqual(r['status'], 1)
- (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], hash_of_foo, 2, self.accounts[9])
+ (tx_hash_hex, o) = c.mint_to(self.address, self.accounts[0], self.accounts[9], hash_of_foo, 2)
r = self.rpc.do(o)
o = receipt(tx_hash_hex)
r = self.conn.do(o)
diff --git a/solidity/CraftNFT.sol b/solidity/CraftNFT.sol
@@ -79,7 +79,7 @@ contract CraftNFT {
return -1;
}
- function mintTo(bytes32 _content, address _recipient) public returns (bytes32) {
+ function mintTo(address _recipient, bytes32 _content) public returns (bytes32) {
uint256 right;
require(mintedToken[_content] == bytes32(0x00));
@@ -104,7 +104,7 @@ contract CraftNFT {
mintedToken[_k] = bytes32(_data);
}
- function mintFromBatchTo(bytes32 _content, uint256 _batch, address _recipient) public returns (bytes32) {
+ function mintFromBatchTo(address _recipient, bytes32 _content, uint256 _batch) public returns (bytes32) {
uint256 left;
uint256 right;
tokenSpec storage spec;
@@ -112,7 +112,7 @@ contract CraftNFT {
spec = token[_content][_batch];
if (_batch == 0 && spec.count == 0) {
spec.cursor += 1;
- return mintTo(_content, _recipient);
+ return mintTo(_recipient, _content);
}
require(spec.cursor < spec.count);
@@ -202,6 +202,50 @@ contract CraftNFT {
emit Transfer(_from, _to, _tokenId);
}
+ // create sha256 scheme URI from tokenId
+ function toURI(bytes32 _data) public pure returns(string memory) {
+ bytes memory out;
+ uint8 t;
+ uint256 c;
+
+ out = new bytes(64 + 7);
+ out[0] = "s";
+ out[1] = "h";
+ out[2] = "a";
+ out[3] = "2";
+ out[4] = "5";
+ out[5] = "6";
+ out[6] = ":";
+
+ c = 7;
+ for (uint256 i = 0; i < 32; i++) {
+ t = (uint8(_data[i]) & 0xf0) >> 4;
+ if (t < 10) {
+ out[c] = bytes1(t + 0x30);
+ } else {
+ out[c] = bytes1(t + 0x57);
+ }
+ t = uint8(_data[i]) & 0x0f;
+ if (t < 10) {
+ out[c+1] = bytes1(t + 0x30);
+ } else {
+ out[c+1] = bytes1(t + 0x57);
+ }
+ c += 2;
+ }
+ return string(out);
+ }
+
+ // ERC-721 (Metadata - optional)
+ function tokenURI(uint256 _tokenId) public view returns (string memory) {
+ bytes32 digest;
+
+ digest = this.getDigest(bytes32(_tokenId));
+
+ return toURI(digest);
+ }
+
+
// EIP-165
function supportsInterface(bytes4 interfaceID) external pure returns (bool) {
if (interfaceID == 0x80ac58cd) { // EIP 721
@@ -213,6 +257,9 @@ contract CraftNFT {
if (interfaceID == 0x780e9d63) { // EIP 721 (Enumerable - optional)
return true;
}
+ if (interfaceID == 0x449a52f8) { // Minter
+ return true;
+ }
if (interfaceID == 0x01ffc9a7) { // EIP 165
return true;
}
