Merge pull request #12 from Anotherblock/dev

Sync dev / latest
Anotherblock · Aug 31, 2023 · 1ee86e3 · 1ee86e3
2 parents 52e59e6 + 319015c
commit 1ee86e3
Show file tree

Hide file tree

Showing 271 changed files with 43,150 additions and 5,484 deletions.
diff --git a/.github/workflows/contracts-test.yml b/.github/workflows/contracts-test.yml
@@ -5,6 +5,7 @@ name: contracts-test
 env:
   OPTIMISM_RPC: ${{ secrets.OPTIMISM_RPC }}
   BASE_GOERLI_RPC: ${{ secrets.BASE_GOERLI_RPC }}
+  BASE_RPC: ${{ secrets.BASE_RPC }}
 
 jobs:
   check:

diff --git a/README.md b/README.md
@@ -48,28 +48,85 @@ deploy and verify ABSuperToken (superfluid mock token) :
 forge script script/op/deploy-ABSuperToken.s.sol:DeployMockSuperToken --rpc-url optimism-goerli --broadcast --verify --etherscan-api-key ${OPTIMISM_ETHERSCAN_API_KEY}
 ```
 
-simulate deployment :
+simulate platform deployment :
 
 ```sh
-    forge script script/op/deploy-platform.s.sol:DeployPlatform --rpc-url optimism-goerli
+    forge script script/op/deploy-platform.s.sol:DeployPlatform --rpc-url optimism-goerli --sig "run(bool)" true
 ```
 
 deploy and verify anotherblock platform contracts :
 
 ```sh
-    forge script script/op/deploy-platform.s.sol:DeployPlatform --rpc-url optimism-goerli --broadcast --verify --etherscan-api-key ${OPTIMISM_ETHERSCAN_API_KEY}
+    forge script script/op/deploy-platform.s.sol:DeployPlatform --rpc-url optimism-goerli --broadcast --verify --etherscan-api-key ${OPTIMISM_ETHERSCAN_API_KEY} --sig "run(bool)" false
+```
+
+simulate ABRoyalty deployment
+
+```sh
+    forge script script/op/deploy-royalty.s.sol:DeployRoyalty --rpc-url base-goerli --sig "run(address)" <publisherAddress>
+```
+
+deploy standalone royalty contract for specific publisher
+
+```sh
+    forge script script/op/deploy-royalty.s.sol:DeployRoyalty --rpc-url base-goerli --sig "run(address)" <publisherAddress> --broadcast --verify
 ```
 
 ### base goerli :
 
-simulate deployment :
+deploy and verify ABSuperToken (superfluid mock token) :
+
+```sh
+forge script script/base-goerli/deploy-ABSuperToken.s.sol:DeployMockSuperToken --rpc-url base-goerli --broadcast --verify
+```
+
+simulate platform deployment :
+
+```sh
+    forge script script/base-goerli/deploy-platform.s.sol:DeployPlatform --rpc-url base-goerli --sig "run(bool)" true
+```
+
+deploy and verify anotherblock platform contracts :
+
+```sh
+    forge script script/base-goerli/deploy-platform.s.sol:DeployPlatform --rpc-url base-goerli --broadcast --verify --sig "run(bool)" false
+```
+
+simulate ABRoyalty deployment
+
+```sh
+    forge script script/base-goerli/deploy-royalty.s.sol:DeployRoyalty --rpc-url base-goerli --sig "run(address)" <publisherAddress>
+```
+
+deploy standalone royalty contract for specific publisher
+
+```sh
+    forge script script/base-goerli/deploy-royalty.s.sol:DeployRoyalty --rpc-url base-goerli --sig "run(address)" <publisherAddress> --broadcast --verify
+```
+
+### base mainnet :
+
+
+simulate platform deployment :
 
 ```sh
-    forge script script/base/deploy-platform.s.sol:DeployPlatform --rpc-url base-goerli
+    forge script script/base/deploy-platform.s.sol:DeployPlatform --rpc-url base --sig "run(bool)" true
 ```
 
 deploy and verify anotherblock platform contracts :
 
 ```sh
-    forge script script/base/deploy-platform.s.sol:DeployPlatform --rpc-url base-goerli --broadcast --verify
+    forge script script/base/deploy-platform.s.sol:DeployPlatform --rpc-url base --broadcast --verify --sig "run(bool)" false
+```
+
+simulate ABRoyalty deployment
+
+```sh
+    forge script script/base/deploy-royalty.s.sol:DeployRoyalty --rpc-url base --sig "run(address)" <publisherAddress>
+```
+
+deploy standalone royalty contract for specific publisher
+
+```sh
+    forge script script/base/deploy-royalty.s.sol:DeployRoyalty --rpc-url base --sig "run(address)" <publisherAddress> --broadcast --verify
 ```
diff --git a/abi/420/ABDataRegistry.json b/abi/420/ABDataRegistry.json
@@ -1,4 +1,9 @@
-{"address": "0xcF2b91661079398A714cC61A038606Cf4ad2C7f1", "abi": [
+{"address": "0x37809397E31c1F6ba0fdc418d15ffabF6b769993", "abi": [
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "inputs": [],
     "name": "ACCOUNT_ALREADY_PUBLISHER",
@@ -571,6 +576,24 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_publisher",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_fee",
+        "type": "uint256"
+      }
+    ],
+    "name": "setPublisherFee",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -602,5 +625,23 @@
     ],
     "stateMutability": "view",
     "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_publisher",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_abRoyalty",
+        "type": "address"
+      }
+    ],
+    "name": "updatePublisher",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   }
 ]}
diff --git a/abi/420/ABRoyalty.json b/abi/420/ABRoyalty.json
@@ -1,4 +1,4 @@
-{"address": "0xb6B41CD998Ec5de6e699512F433d4aA92afF3d58", "abi": [
+{"address": "0xC0ff8F134Ad46aab81348d097904cF3C9616b81e", "abi": [
   {
     "inputs": [],
     "stateMutability": "nonpayable",
@@ -9,6 +9,11 @@
     "name": "INVALID_PARAMETER",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "SUPERTOKEN_INDEX_ERROR",
+    "type": "error"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -123,19 +128,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "FACTORY_ROLE",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "IDA_UNITS_PRECISION",
@@ -175,19 +167,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "anotherCloneFactory",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -495,11 +474,6 @@
         "name": "_publisher",
         "type": "address"
       },
-      {
-        "internalType": "address",
-        "name": "_anotherCloneFactory",
-        "type": "address"
-      },
       {
         "internalType": "address",
         "name": "_abDataRegistry",

diff --git a/abi/420/ABVerifier.json b/abi/420/ABVerifier.json
@@ -1,4 +1,9 @@
-{"address": "0x665D5c7F13a8577B3ab9151CbFdAbfe7CA2D272A", "abi": [
+{"address": "0xA241a4ba8E4eFe866a320cD96cBa7D1963f8B66F", "abi": [
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "inputs": [],
     "name": "INVALID_PARAMETER",

diff --git a/abi/420/AnotherCloneFactory.json b/abi/420/AnotherCloneFactory.json
@@ -1,4 +1,9 @@
-{"address": "0x62ce0E5f9258db956aC35Fc77d7E06dD3b817bc0", "abi": [
+{"address": "0xc5848E0E72B096679BeC3A71073E71B3f4E13031", "abi": [
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "inputs": [],
     "name": "ACCOUNT_NOT_PUBLISHER",
@@ -162,6 +167,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "collectionCount",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -286,19 +304,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "creatorFeeRecipient",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "erc1155Impl",
@@ -431,11 +436,6 @@
         "internalType": "address",
         "name": "_royaltyImpl",
         "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_creatorFeeRecipient",
-        "type": "address"
       }
     ],
     "name": "initialize",

diff --git a/abi/420/ERC1155AB.json b/abi/420/ERC1155AB.json
@@ -1,4 +1,4 @@
-{"address": "0x43627c5eFb8Ba643D238C2D8f180Da82862122bd", "abi": [
+{"address": "0x9eEe492c0e7DF43A05E4965145748834fF4F4c3E", "abi": [
   {
     "inputs": [],
     "stateMutability": "nonpayable",
@@ -899,6 +899,24 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "_tokenId",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_maxSupply",
+        "type": "uint256"
+      }
+    ],
+    "name": "setMaxSupply",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ name: contracts-test @@
     env:
       OPTIMISM_RPC: ${{ secrets.OPTIMISM_RPC }}
       BASE_GOERLI_RPC: ${{ secrets.BASE_GOERLI_RPC }}
+      BASE_RPC: ${{ secrets.BASE_RPC }}
     jobs:
       check:
@@ Expand Down @@