Merge branch 'master' of github.com:meterio/sumer-oracle

meterio · Jul 8, 2024 · ced15d8 · ced15d8
2 parents fd1a67a + 316a424
commit ced15d8
Show file tree

Hide file tree

Showing 20 changed files with 249 additions and 358 deletions.
diff --git a/deployments/metertest.json b/deployments/metertest.json
diff --git a/deployments/metertest/BoundValidator.json b/deployments/metertest/BoundValidator.json
@@ -475,9 +475,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"
-        ],
+        "topics": ["0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"],
         "data": "0x00000000000000000000000014b27d8dc12e59a9904dac6d17d33b8de2e80e66",
         "logIndex": 0,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -514,9 +512,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0x66fd58e82f7b31a2a5c30e0888f3093efe4e111b00cd2b0c31fe014601293aa0"
-        ],
+        "topics": ["0x66fd58e82f7b31a2a5c30e0888f3093efe4e111b00cd2b0c31fe014601293aa0"],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cb5f549cf00c342bc3ba74db2d90d4554dd3de0b",
         "logIndex": 3,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -526,9 +522,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
-        ],
+        "topics": ["0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logIndex": 4,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -538,9 +532,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
-        ],
+        "topics": ["0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018bcd5df1acff8b567b3f82a0b2037d5808ca0ad",
         "logIndex": 5,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -563,9 +555,7 @@
   "deployedBytecode": "0x6080604052600436106100435760003560e01c80633659cfe61461005a5780634f1ef2861461007a5780635c60da1b1461008d578063f851a440146100cb57610052565b36610052576100506100e0565b005b6100506100e0565b34801561006657600080fd5b5061005061007536600461076c565b6100fa565b610050610088366004610787565b61015e565b34801561009957600080fd5b506100a26101ec565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100d757600080fd5b506100a2610244565b6100e86102f1565b6100f86100f36103e2565b610422565b565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614156101565761015381604051806020016040528060008152506000610446565b50565b6101536100e0565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614156101e4576101df8383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525060019250610446915050565b505050565b6101df6100e0565b60003373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161415610239576102346103e2565b905090565b6102416100e0565b90565b60003373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016141561023957507f000000000000000000000000000000000000000000000000000000000000000090565b60606102ce83836040518060600160405280602781526020016108a460279139610471565b9392505050565b73ffffffffffffffffffffffffffffffffffffffff163b151590565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614156100f8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f5472616e73706172656e745570677261646561626c6550726f78793a2061646d60448201527f696e2063616e6e6f742066616c6c6261636b20746f2070726f7879207461726760648201527f6574000000000000000000000000000000000000000000000000000000000000608482015260a4015b60405180910390fd5b60006102347f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5473ffffffffffffffffffffffffffffffffffffffff1690565b3660008037600080366000845af43d6000803e808015610441573d6000f35b3d6000fd5b61044f83610599565b60008251118061045c5750805b156101df5761046b83836102a9565b50505050565b606073ffffffffffffffffffffffffffffffffffffffff84163b610517576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f60448201527f6e7472616374000000000000000000000000000000000000000000000000000060648201526084016103d9565b6000808573ffffffffffffffffffffffffffffffffffffffff168560405161053f9190610836565b600060405180830381855af49150503d806000811461057a576040519150601f19603f3d011682016040523d82523d6000602084013e61057f565b606091505b509150915061058f8282866105e6565b9695505050505050565b6105a281610639565b60405173ffffffffffffffffffffffffffffffffffffffff8216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156105f55750816102ce565b8251156106055782518084602001fd5b816040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103d99190610852565b73ffffffffffffffffffffffffffffffffffffffff81163b6106dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201527f6f74206120636f6e74726163740000000000000000000000000000000000000060648201526084016103d9565b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff92909216919091179055565b803573ffffffffffffffffffffffffffffffffffffffff8116811461076757600080fd5b919050565b60006020828403121561077e57600080fd5b6102ce82610743565b60008060006040848603121561079c57600080fd5b6107a584610743565b9250602084013567ffffffffffffffff808211156107c257600080fd5b818601915086601f8301126107d657600080fd5b8135818111156107e557600080fd5b8760208285010111156107f757600080fd5b6020830194508093505050509250925092565b60005b8381101561082557818101518382015260200161080d565b8381111561046b5750506000910152565b6000825161084881846020870161080a565b9190910192915050565b602081526000825180602084015261087181604085016020870161080a565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016919091016040019291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212206f70214c51cdd41c05ba0ffeb72b309ca3c8be178fd6e73c12162330799984f364736f6c634300080a0033",
   "execute": {
     "methodName": "initialize",
-    "args": [
-      "0xcB5f549cF00C342Bc3BA74db2d90d4554dd3De0b"
-    ]
+    "args": ["0xcB5f549cF00C342Bc3BA74db2d90d4554dd3De0b"]
   },
   "implementation": "0xB8Be299f37c04Fe8980f04fd0733B8D50b235d26",
   "devdoc": {
@@ -599,4 +589,4 @@
     "storage": [],
     "types": null
   }
-}
+}
diff --git a/deployments/metertest/BoundValidator_Implementation.json b/deployments/metertest/BoundValidator_Implementation.json
@@ -349,9 +349,7 @@
         "blockNumber": 61155978,
         "transactionHash": "0xeed2cce0afabee5334fdfa33d920cd5e0a9cb8b96ef5d8aea2eb2f32b4c78c62",
         "address": "0xB8Be299f37c04Fe8980f04fd0733B8D50b235d26",
-        "topics": [
-          "0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"
-        ],
+        "topics": ["0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"],
         "data": "0x00000000000000000000000014b27d8dc12e59a9904dac6d17d33b8de2e80e66",
         "logIndex": 0,
         "blockHash": "0x03a52a8a04672de9bbbd65c517ee03047f9ddc4f4c18731d26505c6c842be82a"
@@ -361,9 +359,7 @@
         "blockNumber": 61155978,
         "transactionHash": "0xeed2cce0afabee5334fdfa33d920cd5e0a9cb8b96ef5d8aea2eb2f32b4c78c62",
         "address": "0xB8Be299f37c04Fe8980f04fd0733B8D50b235d26",
-        "topics": [
-          "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
-        ],
+        "topics": ["0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"],
         "data": "0x00000000000000000000000000000000000000000000000000000000000000ff",
         "logIndex": 1,
         "blockHash": "0x03a52a8a04672de9bbbd65c517ee03047f9ddc4f4c18731d26505c6c842be82a"
@@ -662,4 +658,4 @@
       }
     }
   }
-}
+}
diff --git a/deployments/metertest/BoundValidator_Proxy.json b/deployments/metertest/BoundValidator_Proxy.json
@@ -149,9 +149,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"
-        ],
+        "topics": ["0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"],
         "data": "0x00000000000000000000000014b27d8dc12e59a9904dac6d17d33b8de2e80e66",
         "logIndex": 0,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -188,9 +186,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0x66fd58e82f7b31a2a5c30e0888f3093efe4e111b00cd2b0c31fe014601293aa0"
-        ],
+        "topics": ["0x66fd58e82f7b31a2a5c30e0888f3093efe4e111b00cd2b0c31fe014601293aa0"],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cb5f549cf00c342bc3ba74db2d90d4554dd3de0b",
         "logIndex": 3,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -200,9 +196,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
-        ],
+        "topics": ["0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logIndex": 4,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -212,9 +206,7 @@
         "blockNumber": 61155982,
         "transactionHash": "0x46a5bf2e82f82a63717689717504e14394f529a26e48acdf1a82ec2c1ef9d306",
         "address": "0x94fc301E46a1C8b19e5983B33568236E83A3f07D",
-        "topics": [
-          "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
-        ],
+        "topics": ["0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018bcd5df1acff8b567b3f82a0b2037d5808ca0ad",
         "logIndex": 5,
         "blockHash": "0x03a52a8eb8f1b5cb10221db88528f779eedc539d9333155dec12bdbef31c8561"
@@ -266,4 +258,4 @@
     "storage": [],
     "types": null
   }
-}
+}
diff --git a/deployments/metertest/ChainlinkOracle.json b/deployments/metertest/ChainlinkOracle.json
@@ -527,9 +527,7 @@
         "blockNumber": 61155995,
         "transactionHash": "0xe6006bb86fa5f6a53fcb47545dd8e3e1f05179438dcadb43ad17643303af7518",
         "address": "0x37878010E143A7Bae888AbD59110e0832853bE42",
-        "topics": [
-          "0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"
-        ],
+        "topics": ["0xb35bf4274d4295009f1ec66ed3f579db287889444366c03d3a695539372e8951"],
         "data": "0x00000000000000000000000014b27d8dc12e59a9904dac6d17d33b8de2e80e66",
         "logIndex": 0,
         "blockHash": "0x03a52a9ba810f341615e23b82567319a010dfa36448c5bee28f03fa8fe5b2379"
@@ -566,9 +564,7 @@
         "blockNumber": 61155995,
         "transactionHash": "0xe6006bb86fa5f6a53fcb47545dd8e3e1f05179438dcadb43ad17643303af7518",
         "address": "0x37878010E143A7Bae888AbD59110e0832853bE42",
-        "topics": [
-          "0x66fd58e82f7b31a2a5c30e0888f3093efe4e111b00cd2b0c31fe014601293aa0"
-        ],
+        "topics": ["0x66fd58e82f7b31a2a5c30e0888f3093efe4e111b00cd2b0c31fe014601293aa0"],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cb5f549cf00c342bc3ba74db2d90d4554dd3de0b",
         "logIndex": 3,
         "blockHash": "0x03a52a9ba810f341615e23b82567319a010dfa36448c5bee28f03fa8fe5b2379"
@@ -578,9 +574,7 @@
         "blockNumber": 61155995,
         "transactionHash": "0xe6006bb86fa5f6a53fcb47545dd8e3e1f05179438dcadb43ad17643303af7518",
         "address": "0x37878010E143A7Bae888AbD59110e0832853bE42",
-        "topics": [
-          "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
-        ],
+        "topics": ["0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logIndex": 4,
         "blockHash": "0x03a52a9ba810f341615e23b82567319a010dfa36448c5bee28f03fa8fe5b2379"
@@ -590,9 +584,7 @@
         "blockNumber": 61155995,
         "transactionHash": "0xe6006bb86fa5f6a53fcb47545dd8e3e1f05179438dcadb43ad17643303af7518",
         "address": "0x37878010E143A7Bae888AbD59110e0832853bE42",
-        "topics": [
-          "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
-        ],
+        "topics": ["0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018bcd5df1acff8b567b3f82a0b2037d5808ca0ad",
         "logIndex": 5,
         "blockHash": "0x03a52a9ba810f341615e23b82567319a010dfa36448c5bee28f03fa8fe5b2379"
@@ -615,9 +607,7 @@
   "deployedBytecode": "0x6080604052600436106100435760003560e01c80633659cfe61461005a5780634f1ef2861461007a5780635c60da1b1461008d578063f851a440146100cb57610052565b36610052576100506100e0565b005b6100506100e0565b34801561006657600080fd5b5061005061007536600461076c565b6100fa565b610050610088366004610787565b61015e565b34801561009957600080fd5b506100a26101ec565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100d757600080fd5b506100a2610244565b6100e86102f1565b6100f86100f36103e2565b610422565b565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614156101565761015381604051806020016040528060008152506000610446565b50565b6101536100e0565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614156101e4576101df8383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525060019250610446915050565b505050565b6101df6100e0565b60003373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161415610239576102346103e2565b905090565b6102416100e0565b90565b60003373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016141561023957507f000000000000000000000000000000000000000000000000000000000000000090565b60606102ce83836040518060600160405280602781526020016108a460279139610471565b9392505050565b73ffffffffffffffffffffffffffffffffffffffff163b151590565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614156100f8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f5472616e73706172656e745570677261646561626c6550726f78793a2061646d60448201527f696e2063616e6e6f742066616c6c6261636b20746f2070726f7879207461726760648201527f6574000000000000000000000000000000000000000000000000000000000000608482015260a4015b60405180910390fd5b60006102347f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5473ffffffffffffffffffffffffffffffffffffffff1690565b3660008037600080366000845af43d6000803e808015610441573d6000f35b3d6000fd5b61044f83610599565b60008251118061045c5750805b156101df5761046b83836102a9565b50505050565b606073ffffffffffffffffffffffffffffffffffffffff84163b610517576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f60448201527f6e7472616374000000000000000000000000000000000000000000000000000060648201526084016103d9565b6000808573ffffffffffffffffffffffffffffffffffffffff168560405161053f9190610836565b600060405180830381855af49150503d806000811461057a576040519150601f19603f3d011682016040523d82523d6000602084013e61057f565b606091505b509150915061058f8282866105e6565b9695505050505050565b6105a281610639565b60405173ffffffffffffffffffffffffffffffffffffffff8216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156105f55750816102ce565b8251156106055782518084602001fd5b816040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103d99190610852565b73ffffffffffffffffffffffffffffffffffffffff81163b6106dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201527f6f74206120636f6e74726163740000000000000000000000000000000000000060648201526084016103d9565b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff92909216919091179055565b803573ffffffffffffffffffffffffffffffffffffffff8116811461076757600080fd5b919050565b60006020828403121561077e57600080fd5b6102ce82610743565b60008060006040848603121561079c57600080fd5b6107a584610743565b9250602084013567ffffffffffffffff808211156107c257600080fd5b818601915086601f8301126107d657600080fd5b8135818111156107e557600080fd5b8760208285010111156107f757600080fd5b6020830194508093505050509250925092565b60005b8381101561082557818101518382015260200161080d565b8381111561046b5750506000910152565b6000825161084881846020870161080a565b9190910192915050565b602081526000825180602084015261087181604085016020870161080a565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016919091016040019291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212206f70214c51cdd41c05ba0ffeb72b309ca3c8be178fd6e73c12162330799984f364736f6c634300080a0033",
   "execute": {
     "methodName": "initialize",
-    "args": [
-      "0xcB5f549cF00C342Bc3BA74db2d90d4554dd3De0b"
-    ]
+    "args": ["0xcB5f549cF00C342Bc3BA74db2d90d4554dd3De0b"]
   },
   "implementation": "0xaFc830c7cDDE3E1De62fb045ba503F59F26058AB",
   "devdoc": {
@@ -651,4 +641,4 @@
     "storage": [],
     "types": null
   }
-}
+}