Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No hard requirement for service staking for mechs and requesters #47

Open
wants to merge 116 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
ce8dd77
No hard requirement for service staking for mechs and requesters
kupermind Dec 11, 2024
e8efb9b
chore: injecting revert
kupermind Dec 11, 2024
a3f1b0a
test: updating tests
kupermind Dec 11, 2024
8f7d80c
test: updating tests
kupermind Dec 11, 2024
56ab319
feat: first part of service registry replacing agent registry
DavidMinarsch Dec 12, 2024
7d32ead
refactor: agent mechs and factory (soon to be deprecated)
kupermind Dec 12, 2024
d1bfb10
refactor: creating mechs in marketplace
kupermind Dec 12, 2024
4d9087c
refactor: extract create into MM
kupermind Dec 12, 2024
fd55adc
fix: size correction
kupermind Dec 12, 2024
47f7127
fix: removing unnecessary bytecode
kupermind Dec 12, 2024
7356c7b
chore: additional check for safety
kupermind Dec 12, 2024
b524d58
fix: mech market check
kupermind Dec 12, 2024
1300039
fix: mech market check
kupermind Dec 12, 2024
ca943a4
refactor: mech manager to control marketplaces and factories
kupermind Dec 13, 2024
3eb3ad2
feat: adding payment process logic
kupermind Dec 13, 2024
85c513a
chore: todo
kupermind Dec 13, 2024
6d37c92
Merge pull request #50 from valory-xyz/service3
DavidMinarsch Dec 13, 2024
dcc149c
Merge pull request #49 from valory-xyz/service2
DavidMinarsch Dec 13, 2024
0f89398
Merge pull request #48 from valory-xyz/service
DavidMinarsch Dec 13, 2024
53d6380
refactor: marketplace proxy
kupermind Dec 16, 2024
44cdd81
refactor: adjust MM to mech payment
kupermind Dec 16, 2024
a9e87f1
refactor: adjust MM to mech payment
kupermind Dec 16, 2024
42bb2cc
refactor: wrapping collected fees
kupermind Dec 16, 2024
ef4acbd
chore: linters
kupermind Dec 16, 2024
7c2c719
Merge pull request #52 from valory-xyz/marketplace_proxy
DavidMinarsch Dec 16, 2024
089eb23
Merge pull request #51 from valory-xyz/mech_manager
DavidMinarsch Dec 16, 2024
e388792
Update contracts/AgentMech.sol
kupermind Dec 16, 2024
61db1ae
refactor: majority of mechs logic go into OlasMech
kupermind Dec 16, 2024
c5b3523
chore: adding file
kupermind Dec 16, 2024
10444a8
chore: removing unnecessary includes
kupermind Dec 16, 2024
8803e61
refactor: further marketplace updates
kupermind Dec 16, 2024
7769b82
chore: adding errors
kupermind Dec 16, 2024
f1affad
test: initial testing
kupermind Dec 17, 2024
8ae26d7
chore: comments
kupermind Dec 17, 2024
7a8708d
chore: comments
kupermind Dec 17, 2024
dac885b
fix: correcting fee recording
kupermind Dec 17, 2024
dd599f3
fix: constructor fix
kupermind Dec 17, 2024
a47d815
chore: adding ABIs
kupermind Dec 17, 2024
f6dffed
fix: payable proxy
kupermind Dec 17, 2024
1f96a78
doc: init audit 0.4.0
Dec 17, 2024
aa27deb
doc: init audit 0.4.0
Dec 17, 2024
17be280
test: updating tests
kupermind Dec 17, 2024
15a0de7
Merge pull request #54 from valory-xyz/mech_fixed_testing
DavidMinarsch Dec 17, 2024
855dbe5
Merge pull request #53 from valory-xyz/refactor
DavidMinarsch Dec 17, 2024
cc622ea
doc: init audit 0.4.0
Dec 18, 2024
d46581d
doc: init audit 0.4.0
Dec 18, 2024
ce43a46
doc: audit 0.4.0
Dec 18, 2024
2e7599a
refactor: split delivery rates according to mech type
kupermind Dec 18, 2024
eb18399
refactor: return finalized delivery rate for request
kupermind Dec 18, 2024
d286518
refactor: separate escrows for each of mech type
kupermind Dec 18, 2024
83c91de
refactor: avoid micropayments
kupermind Dec 19, 2024
bda0ff7
refactor: further enhancements
kupermind Dec 19, 2024
7928af8
refactor: further enhancements
kupermind Dec 19, 2024
faf25d6
chore: compilation
kupermind Dec 19, 2024
80abe90
chore: comment
kupermind Dec 19, 2024
f8828dd
chore: function shuffling
kupermind Dec 19, 2024
38f04b8
fix: delivery rate
kupermind Dec 19, 2024
54066f7
chore: comment
kupermind Dec 19, 2024
14a0aef
chore: comment
kupermind Dec 19, 2024
a3060ea
refactor: overflow protection
kupermind Dec 19, 2024
8f73161
chore: comment
kupermind Dec 19, 2024
6fac6e9
Merge pull request #58 from valory-xyz/split_payments3
DavidMinarsch Dec 20, 2024
398cfda
Merge pull request #57 from valory-xyz/split_payments2
DavidMinarsch Dec 20, 2024
a9e00d8
refactor: payments as subscription and as micropayments for requests
kupermind Dec 20, 2024
8913e1b
chore: todo-s
kupermind Dec 20, 2024
1e28d36
fix: more addressing
kupermind Dec 20, 2024
52f2545
chore: unused events
kupermind Dec 20, 2024
0c9117c
refactor: inheritance
kupermind Dec 20, 2024
ee0e310
chore: comment
kupermind Dec 20, 2024
b96eb50
Merge pull request #55 from valory-xyz/v0.4.0-internal-audit
kupermind Dec 20, 2024
325bd93
Merge branch 'unchained_mm' into payments_refactor
kupermind Dec 20, 2024
fd16c4f
doc: init 0.4.0-internal-audit2
Dec 20, 2024
2010adf
doc: init 0.4.0-internal-audit2
Dec 20, 2024
57c49d9
chore: minor adjustments
kupermind Dec 20, 2024
91334e6
Merge pull request #56 from valory-xyz/split_payments
DavidMinarsch Dec 21, 2024
e315a13
Merge pull request #59 from valory-xyz/payments_refactor
DavidMinarsch Dec 21, 2024
23edb2c
Merge pull request #60 from valory-xyz/v0.4.0-internal-audit2
DavidMinarsch Dec 22, 2024
4f1828e
chore: partial changes
DavidMinarsch Dec 22, 2024
a1c0a7d
chore: minor fix
DavidMinarsch Dec 22, 2024
4677d64
refactor and fix: addressing recent changes
kupermind Dec 23, 2024
2800c4a
fix: MM only for factories
kupermind Dec 23, 2024
c9085db
refactor: continue
kupermind Dec 23, 2024
ea7dcb4
fix: mech multisig is back
kupermind Dec 23, 2024
839ff2d
Merge pull request #62 from valory-xyz/fix2
DavidMinarsch Dec 23, 2024
ce138d9
test: updating tests
kupermind Dec 23, 2024
f5819a9
chore: removing duplicate
kupermind Dec 23, 2024
aa13bf3
chore: linter
kupermind Dec 23, 2024
a115b58
fix: contract name
kupermind Dec 23, 2024
032574d
Merge pull request #63 from valory-xyz/fix_tests
DavidMinarsch Dec 23, 2024
6e6e87c
test: enhancing tests
kupermind Dec 24, 2024
2297cb8
chore: linters
kupermind Dec 24, 2024
5c3350b
refactor: fee formula as suggested
kupermind Dec 25, 2024
0a3e4b7
fix: delivery recording bug
kupermind Dec 26, 2024
cb283c8
fix: more bugs
kupermind Dec 26, 2024
eeb2093
chore: linters
kupermind Dec 26, 2024
ba5f96e
Merge pull request #65 from valory-xyz/tests2
DavidMinarsch Dec 26, 2024
a41de39
Merge pull request #64 from valory-xyz/tests
DavidMinarsch Dec 26, 2024
e653637
Merge pull request #61 from valory-xyz/fix
DavidMinarsch Dec 26, 2024
8703480
test: adding more tests
kupermind Dec 26, 2024
f729790
chore: linters
kupermind Dec 26, 2024
039ae6b
Merge pull request #66 from valory-xyz/more_tests
DavidMinarsch Dec 27, 2024
5e07ec3
test: more tests
kupermind Dec 27, 2024
27fbf8b
Merge pull request #67 from valory-xyz/more_tests2
DavidMinarsch Dec 27, 2024
bdac52c
chore and doc: move files and function around, natspec
kupermind Dec 27, 2024
4f5c44c
Merge pull request #68 from valory-xyz/move_around
kupermind Dec 27, 2024
170ddb7
test: more tests and name fix
kupermind Jan 2, 2025
e7a836c
feat: adding missing files
kupermind Jan 2, 2025
e62c962
Merge pull request #69 from valory-xyz/more_tests3
DavidMinarsch Jan 2, 2025
024eb52
doc: started internal-audit-4
Jan 6, 2025
853a6b3
doc: started internal-audit-4
Jan 6, 2025
0d82e42
doc: continue internal-audit-4
Jan 7, 2025
fc6f378
doc: continue internal-audit-4
Jan 7, 2025
1d5b129
doc: continue internal-audit-4
Jan 7, 2025
34af7ff
doc: internal-audit-4
Jan 7, 2025
7344b86
doc: internal-audit-4
Jan 7, 2025
ed99811
Merge pull request #71 from valory-xyz/v0.4.0-internal-audit
kupermind Jan 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .solcover.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
module.exports = {
skipFiles: ["test/ReentrancyAttacker.sol"]
skipFiles: [
"test/ImportsSetup.sol",
"test/MockServiceStaking.sol",
"test/MechReentrancyAttacker.sol"
]
};
2 changes: 1 addition & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "solhint:recommended",
"plugins": [],
"rules": {
"compiler-version": ["warn", "^0.8.25"],
"compiler-version": ["warn", "^0.8.28"],
"func-visibility": ["warn",{"ignoreConstructors":true}],
"no-empty-blocks": "off",
"not-rely-on-time": "off",
Expand Down
359 changes: 359 additions & 0 deletions abis/0.8.28/Karma.json

Large diffs are not rendered by default.

59 changes: 59 additions & 0 deletions abis/0.8.28/KarmaProxy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"_format": "hh-sol-artifact-1",
"contractName": "KarmaProxy",
"sourceName": "contracts/KarmaProxy.sol",
"abi": [
{
"inputs": [
{
"internalType": "address",
"name": "implementation",
"type": "address"
},
{
"internalType": "bytes",
"name": "karmaData",
"type": "bytes"
}
],
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"inputs": [],
"name": "InitializationFailed",
"type": "error"
},
{
"inputs": [],
"name": "ZeroImplementationAddress",
"type": "error"
},
{
"inputs": [],
"name": "ZeroKarmaData",
"type": "error"
},
{
"stateMutability": "nonpayable",
"type": "fallback"
},
{
"inputs": [],
"name": "KARMA_PROXY",
"outputs": [
{
"internalType": "bytes32",
"name": "",
"type": "bytes32"
}
],
"stateMutability": "view",
"type": "function"
}
],
"bytecode": "0x608060405234801561000f575f5ffd5b506040516102f23803806102f283398101604081905261002e9161012d565b6001600160a01b0382166100555760405163d02c623d60e01b815260040160405180910390fd5b80515f0361007657604051630113854b60e61b815260040160405180910390fd5b817f1e4b6d67098d4183ce03b91c95f9376a98c5440ec22f2cf171d6dca04a5a29d8555f826001600160a01b0316826040516100b291906101fc565b5f60405180830381855af49150503d805f81146100ea576040519150601f19603f3d011682016040523d82523d5f602084013e6100ef565b606091505b505090508061011157604051630337323560e31b815260040160405180910390fd5b505050610212565b634e487b7160e01b5f52604160045260245ffd5b5f5f6040838503121561013e575f5ffd5b82516001600160a01b0381168114610154575f5ffd5b60208401519092506001600160401b0381111561016f575f5ffd5b8301601f8101851361017f575f5ffd5b80516001600160401b0381111561019857610198610119565b604051601f8201601f19908116603f011681016001600160401b03811182821017156101c6576101c6610119565b6040528181528282016020018710156101dd575f5ffd5b8160208401602083015e5f602083830101528093505050509250929050565b5f82518060208501845e5f920191825250919050565b60d48061021e5f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063fc3aecd0146066575b7f1e4b6d67098d4183ce03b91c95f9376a98c5440ec22f2cf171d6dca04a5a29d854365f5f375f5f365f845af490503d5f5f3e806061573d5ffd5b503d5ff35b608c7f1e4b6d67098d4183ce03b91c95f9376a98c5440ec22f2cf171d6dca04a5a29d881565b60405190815260200160405180910390f3fea2646970667358221220650ce2fa202714ca25909bc154d6780801002cb669b97a48d5e72eef2763f12e64736f6c634300081c0033",
"deployedBytecode": "0x6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063fc3aecd0146066575b7f1e4b6d67098d4183ce03b91c95f9376a98c5440ec22f2cf171d6dca04a5a29d854365f5f375f5f365f845af490503d5f5f3e806061573d5ffd5b503d5ff35b608c7f1e4b6d67098d4183ce03b91c95f9376a98c5440ec22f2cf171d6dca04a5a29d881565b60405190815260200160405180910390f3fea2646970667358221220650ce2fa202714ca25909bc154d6780801002cb669b97a48d5e72eef2763f12e64736f6c634300081c0033",
"linkReferences": {},
"deployedLinkReferences": {}
}
Loading
Loading