Merge branch 'development'

Universal-Page · Feb 14, 2024 · e7560a6 · e7560a6
2 parents 96bdbf7 + 5ed3b5d
commit e7560a6
Show file tree

Hide file tree

Showing 9 changed files with 1,461 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@
 | mainnet | Participant           | 0xa29aeaabb5da0cc3635576933a66c1b714f058c1 |
 | mainnet | LSP7Listings          | 0xe7f5c709d62bcc3701f4c0cb871eb77e301283b5 |
 | mainnet | LSP7Offers            | 0xb2379f3f3c623cd2ed18e97e407cdda8fe6c6da6 |
+| mainnet | LSP7Orders            |  |
 | mainnet | LSP7Marketplace       | 0xe04cf97440cd191096c4103f9c48abd96184fb8d |
 | mainnet | LSP8Listings          | 0x4faab47b234c7f5da411429ee86cb15cb0754354 |
 | mainnet | LSP8Offers            | 0xed189b51455c9714aa49b0c55529469c512b10b6 |
@@ -25,6 +26,7 @@
 | testnet | Participant           | 0x5a485297a1b909032a6b7000354f3322047028ee |
 | testnet | LSP7Listings          | 0x44cd7d06ceb509370b75e426ea3c12824a665e36 |
 | testnet | LSP7Offers            | 0xdf9defd55365b7b073cae009cf53dd830902c5a7 |
+| testnet | LSP7Orders            | 0xf030798a7b2722c32b58fae3aee5019989cd409f |
 | testnet | LSP7Marketplace       | 0xc9c940a35fc8d3522085b991ce3e1a920354f19a |
 | testnet | LSP8Listings          | 0xf069f9b8e0f96d742c6dfd3d78b0e382f3411207 |
 | testnet | LSP8Offers            | 0xaebcc2c80abacb7e4d928d4c0a52c7bbeba4c4be |

diff --git a/artifacts/abi/marketplace/lsp7/LSP7Marketplace.json b/artifacts/abi/marketplace/lsp7/LSP7Marketplace.json
@@ -129,11 +129,6 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "listingId",
-        "type": "uint256"
-      },
       {
         "internalType": "address",
         "name": "account",
@@ -318,6 +313,43 @@
     "name": "RoyaltiesPaid",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "asset",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "itemCount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "totalPaid",
+        "type": "uint256"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "recipient",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "RoyaltiesPaidOut",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -380,6 +412,61 @@
     "name": "Sale",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "asset",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "seller",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "buyer",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "itemCount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "totalPaid",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "totalFee",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "totalRoyalties",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "Sold",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -498,6 +585,24 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "orderId",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "itemCount",
+        "type": "uint256"
+      }
+    ],
+    "name": "fillOrder",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -520,6 +625,11 @@
         "name": "offers_",
         "type": "address"
       },
+      {
+        "internalType": "contract ILSP7Orders",
+        "name": "orders_",
+        "type": "address"
+      },
       {
         "internalType": "contract IParticipant",
         "name": "participant_",
@@ -557,6 +667,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "orders",
+    "outputs": [
+      {
+        "internalType": "contract ILSP7Orders",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "owner",
@@ -649,6 +772,19 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "orders_",
+        "type": "address"
+      }
+    ],
+    "name": "setOrders",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {