Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
lykhonis committed Aug 19, 2024
2 parents 342ea0c + a39b215 commit 99ff1dc
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 36 deletions.
36 changes: 0 additions & 36 deletions artifacts/abi/marketplace/lsp7/LSP7Marketplace.json
Original file line number Diff line number Diff line change
Expand Up @@ -518,24 +518,6 @@
"name": "ValueWithdrawn",
"type": "event"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "listingId",
"type": "uint256"
},
{
"internalType": "address",
"name": "buyer",
"type": "address"
}
],
"name": "acceptOffer",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "beneficiary",
Expand Down Expand Up @@ -620,11 +602,6 @@
"name": "listings_",
"type": "address"
},
{
"internalType": "contract ILSP7Offers",
"name": "offers_",
"type": "address"
},
{
"internalType": "contract ILSP7Orders",
"name": "orders_",
Expand Down Expand Up @@ -654,19 +631,6 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "offers",
"outputs": [
{
"internalType": "contract ILSP7Offers",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "orders",
Expand Down
21 changes: 21 additions & 0 deletions artifacts/abi/marketplace/lsp8/LSP8Offers.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,27 @@
"name": "OwnableCannotSetZeroAddressAsOwner",
"type": "error"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "listingId",
"type": "uint256"
},
{
"internalType": "address",
"name": "buyer",
"type": "address"
},
{
"internalType": "uint256",
"name": "cooldownTimestamp",
"type": "uint256"
}
],
"name": "RecentlyCanceled",
"type": "error"
},
{
"inputs": [
{
Expand Down
1 change: 1 addition & 0 deletions artifacts/bytecode/8453/assets/lsp7/DigitalAssetDrop.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x60a060405234801561001057600080fd5b50604051610c71380380610c7183398101604081905261002f916101ad565b600180556001600160a01b03831661007e5760405162461bcd60e51b815260206004820152600d60248201526c6173736574206973207a65726f60981b60448201526064015b60405180910390fd5b60008290036100be5760405162461bcd60e51b815260206004820152600c60248201526b726f6f74206973207a65726f60a01b6044820152606401610075565b6001600160a01b0381166101045760405162461bcd60e51b815260206004820152600d60248201526c6f776e6572206973207a65726f60981b6044820152606401610075565b6001600160a01b03831660805261011a82600255565b6101238161012b565b5050506101f0565b6000546001600160a01b0382811691161461019557600080546040516001600160a01b03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a3600080546001600160a01b0319166001600160a01b0383161790555b50565b6001600160a01b038116811461019557600080fd5b6000806000606084860312156101c257600080fd5b83516101cd81610198565b6020850151604086015191945092506101e581610198565b809150509250925092565b608051610a5261021f6000396000818160870152818161024f0152818161034c01526104450152610a526000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80639e34070f1161005b5780639e34070f146100e1578063c8edd8ab14610104578063f05c55ac14610117578063f2fde38b1461012a57600080fd5b806338d52e0f14610082578063715018a6146100c65780638da5cb5b146100d0575b600080fd5b6100a97f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b0390911681526020015b60405180910390f35b6100ce61013d565b005b6000546001600160a01b03166100a9565b6100f46100ef366004610874565b610151565b60405190151581526020016100bd565b6100ce6101123660046108a9565b610162565b6100ce61012536600461093d565b6102bb565b6100ce61013836600461093d565b6104ae565b6101456104ff565b61014f6000610554565b565b600061015c826105da565b92915050565b61016a61061b565b6101ca8585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051336020820152908101869052879250606001905060405160208183030381529060405261068e565b816001600160a01b0316837f4ec90e965519d92681267467f775ada5bd214aa92c0dc93d90a5e880ce9ed0268360405161020691815260200190565b60405180910390a3604051633b06cddd60e11b81523060048201526001600160a01b0383811660248301526044820183905260006064830181905260a0608484015260a48301527f0000000000000000000000000000000000000000000000000000000000000000169063760d9bba9060c401600060405180830381600087803b15801561029357600080fd5b505af11580156102a7573d6000803e3d6000fd5b505050506102b460018055565b5050505050565b6102c36104ff565b6102cb61061b565b6001600160a01b03811661031b576040517f1a3b45fd0000000000000000000000000000000000000000000000000000000081526001600160a01b03821660048201526024015b60405180910390fd5b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381865afa15801561039b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103bf9190610958565b9050816001600160a01b03167feb44e1b23fad598a86840f12d9ab99216d186e1eeebb5ef8e3b3d152ba7cbc7e826040516103fc91815260200190565b60405180910390a2604051633b06cddd60e11b81523060048201526001600160a01b038381166024830152604482018390526001606483015260a06084830152600060a48301527f0000000000000000000000000000000000000000000000000000000000000000169063760d9bba9060c401600060405180830381600087803b15801561048957600080fd5b505af115801561049d573d6000803e3d6000fd5b50505050506104ab60018055565b50565b6104b66104ff565b6001600160a01b0381166104f6576040517f1ad8836c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6104ab81610554565b336105126000546001600160a01b031690565b6001600160a01b03161461014f576040517fbf1169c5000000000000000000000000000000000000000000000000000000008152336004820152602401610312565b6000546001600160a01b038281169116146104ab57600080546040516001600160a01b03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a3600080546001600160a01b0383167fffffffffffffffffffffffff000000000000000000000000000000000000000090911617905550565b6000806105e961010084610987565b905060006105f96101008561099b565b60009283526003602052604090922054600190921b9182169091149392505050565b600260015403610687576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610312565b6002600155565b6002546106c7576040517f5058901600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6106d0826105da565b1561070b5781816040517f331e2c3f0000000000000000000000000000000000000000000000000000000081526004016103129291906109af565b600082826040516020016107209291906109af565b60408051601f198184030181528282528051602091820120908301520160405160208183030381529060405280519060200120905061076284600254836107ab565b61079c5782826040517f4a0e7b130000000000000000000000000000000000000000000000000000000081526004016103129291906109af565b6107a5836107c1565b50505050565b6000826107b885846107ff565b14949350505050565b60006107cf61010083610987565b905060006107df6101008461099b565b6000928352600360205260409092208054600190931b9092179091555050565b600081815b845181101561083a576108308286838151811061082357610823610a06565b6020026020010151610842565b9150600101610804565b509392505050565b600081831061085e57600082815260208490526040902061086d565b60008381526020839052604090205b9392505050565b60006020828403121561088657600080fd5b5035919050565b80356001600160a01b03811681146108a457600080fd5b919050565b6000806000806000608086880312156108c157600080fd5b853567ffffffffffffffff808211156108d957600080fd5b818801915088601f8301126108ed57600080fd5b8135818111156108fc57600080fd5b8960208260051b850101111561091157600080fd5b60209283019750955050860135925061092c6040870161088d565b949793965091946060013592915050565b60006020828403121561094f57600080fd5b61086d8261088d565b60006020828403121561096a57600080fd5b5051919050565b634e487b7160e01b600052601260045260246000fd5b60008261099657610996610971565b500490565b6000826109aa576109aa610971565b500690565b8281526000602060406020840152835180604085015260005b818110156109e4578581018301518582016060015282016109c8565b506000606082860101526060601f19601f830116850101925050509392505050565b634e487b7160e01b600052603260045260246000fdfea264697066735822122090835f49f14edac192f631092f8722505f961d9fb7f8bf779dc4aa25a1f18b8c64736f6c63430008160033

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions artifacts/bytecode/8453/drops/LSP7DropsDigitalAsset.bin

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions artifacts/bytecode/8453/drops/LSP7DropsLightAsset.bin

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions artifacts/bytecode/8453/drops/LSP8DropsDigitalAsset.bin

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions artifacts/bytecode/8453/drops/LSP8DropsLightAsset.bin

Large diffs are not rendered by default.

0 comments on commit 99ff1dc

Please sign in to comment.